more style fixes

make mobile look nice
open folders that are prefixes of current path
2025-12-01 18:27:57 +01:00 · 2025-03-09 14:49:53 -07:00 · 2025-03-09 14:03:10 -07:00 · 2025-03-09 10:05:27 -07:00 · 2025-03-09 09:57:12 -07:00 · 2025-03-09 09:20:35 -07:00
73 changed files with 1687 additions and 1700 deletions
--- a/docs/advanced/making
+++ b/docs/advanced/making
@@ -25,11 +25,10 @@ The following sections will go into detail for what methods can be implemented f
 - `BuildCtx` is defined in `quartz/ctx.ts`. It consists of
  - `argv`: The command line arguments passed to the Quartz [[build]] command
  - `cfg`: The full Quartz [[configuration]]
-  - `allSlugs`: a list of all the valid content slugs (see [[paths]] for more information on what a slug is)
+  - `allSlugs`: a list of all the valid content slugs (see [[paths]] for more information on what a `ServerSlug` is)
 - `StaticResources` is defined in `quartz/resources.tsx`. It consists of
  - `css`: a list of CSS style definitions that should be loaded. A CSS style is described with the `CSSResource` type which is also defined in `quartz/resources.tsx`. It accepts either a source URL or the inline content of the stylesheet.
  - `js`: a list of scripts that should be loaded. A script is described with the `JSResource` type which is also defined in `quartz/resources.tsx`. It allows you to define a load time (either before or after the DOM has been loaded), whether it should be a module, and either the source URL or the inline content of the script.
-  - `additionalHead`: a list of JSX elements or functions that return JSX elements to be added to the `<head>` tag of the page. Functions receive the page's data as an argument and can conditionally render elements.

 ## Transformers

@@ -235,7 +234,7 @@ export type WriteOptions = (data: {
  // the build context
  ctx: BuildCtx
  // the name of the file to emit (not including the file extension)
-  slug: FullSlug
+  slug: ServerSlug
  // the file extension
  ext: `.${string}` | ""
  // the file content to add
--- a/docs/features/explorer.md
+++ b/docs/features/explorer.md
@@ -27,10 +27,12 @@ Component.Explorer({
  folderClickBehavior: "collapse", // what happens when you click a folder ("link" to navigate to folder page on click or "collapse" to collapse folder on click)
  folderDefaultState: "collapsed", // default state of folders ("collapsed" or "open")
  useSavedState: true, // whether to use local storage to save "state" (which folders are opened) of explorer
-  // omitted but shown later
-  sortFn: ...,
-  filterFn: ...,
-  mapFn: ...,
+  // Sort order: folders first, then files. Sort folders and files alphabetically
+  sortFn: (a, b) => {
+    ... // default implementation shown later
+  },
+  filterFn: filterFn: (node) => node.name !== "tags", // filters out 'tags' folder
+  mapFn: undefined,
  // what order to apply functions in
  order: ["filter", "map", "sort"],
 })
@@ -52,23 +54,17 @@ Want to customize it even more?
 ## Advanced customization

 This component allows you to fully customize all of its behavior. You can pass a custom `sort`, `filter` and `map` function.
-All functions you can pass work with the `FileTrieNode` class, which has the following properties:
+All functions you can pass work with the `FileNode` class, which has the following properties:

-```ts title="quartz/components/Explorer.tsx"
-class FileTrieNode {
-  isFolder: boolean
-  children: Array<FileTrieNode>
-  data: ContentDetails | null
-}
-```
+```ts title="quartz/components/ExplorerNode.tsx" {2-5}
+export class FileNode {
+  children: FileNode[]  // children of current node
+  name: string  // last part of slug
+  displayName: string // what actually should be displayed in the explorer
+  file: QuartzPluginData | null // if node is a file, this is the file's metadata. See `QuartzPluginData` for more detail
+  depth: number // depth of current node

-```ts title="quartz/plugins/emitters/contentIndex.tsx"
-export type ContentDetails = {
-  slug: FullSlug
-  title: string
-  links: SimpleSlug[]
-  tags: string[]
-  content: string
+  ... // rest of implementation
 }
 ```

@@ -78,14 +74,15 @@ Every function you can pass is optional. By default, only a `sort` function will
 // Sort order: folders first, then files. Sort folders and files alphabetically
 Component.Explorer({
  sortFn: (a, b) => {
-    if ((!a.isFolder && !b.isFolder) || (a.isFolder && b.isFolder)) {
+    if ((!a.file && !b.file) || (a.file && b.file)) {
+      // sensitivity: "base": Only strings that differ in base letters compare as unequal. Examples: a ≠ b, a = á, a = A
+      // numeric: true: Whether numeric collation should be used, such that "1" < "2" < "10"
      return a.displayName.localeCompare(b.displayName, undefined, {
        numeric: true,
        sensitivity: "base",
      })
    }
-
-    if (!a.isFolder && b.isFolder) {
+    if (a.file && !b.file) {
      return 1
    } else {
      return -1
@@ -103,23 +100,41 @@ For more information on how to use `sort`, `filter` and `map`, you can check [Ar
 Type definitions look like this:

 ```ts
-type SortFn = (a: FileTrieNode, b: FileTrieNode) => number
-type FilterFn = (node: FileTrieNode) => boolean
-type MapFn = (node: FileTrieNode) => void
+sortFn: (a: FileNode, b: FileNode) => number
+filterFn: (node: FileNode) => boolean
+mapFn: (node: FileNode) => void
 ```

+> [!tip]
+> You can check if a `FileNode` is a folder or a file like this:
+>
+> ```ts
+> if (node.file) {
+>   // node is a file
+> } else {
+>   // node is a folder
+> }
+> ```
+
 ## Basic examples

 These examples show the basic usage of `sort`, `map` and `filter`.

 ### Use `sort` to put files first

-Using this example, the explorer will alphabetically sort everything.
+Using this example, the explorer will alphabetically sort everything, but put all **files** above all **folders**.

 ```ts title="quartz.layout.ts"
 Component.Explorer({
  sortFn: (a, b) => {
+    if ((!a.file && !b.file) || (a.file && b.file)) {
      return a.displayName.localeCompare(b.displayName)
+    }
+    if (a.file && !b.file) {
+      return -1
+    } else {
+      return 1
+    }
  },
 })
 ```
@@ -131,43 +146,43 @@ Using this example, the display names of all `FileNodes` (folders + files) will
 ```ts title="quartz.layout.ts"
 Component.Explorer({
  mapFn: (node) => {
-    return (node.displayName = node.displayName.toUpperCase())
+    node.displayName = node.displayName.toUpperCase()
  },
 })
 ```

 ### Remove list of elements (`filter`)

-Using this example, you can remove elements from your explorer by providing an array of folders/files to exclude.
-Note that this example filters on the title but you can also do it via slug or any other field available on `FileTrieNode`.
+Using this example, you can remove elements from your explorer by providing an array of folders/files using the `omit` set.

 ```ts title="quartz.layout.ts"
 Component.Explorer({
  filterFn: (node) => {
    // set containing names of everything you want to filter out
    const omit = new Set(["authoring content", "tags", "hosting"])
-    return !omit.has(node.data.title.toLowerCase())
+    return !omit.has(node.name.toLowerCase())
  },
 })
 ```

+You can customize this by changing the entries of the `omit` set. Simply add all folder or file names you want to remove.
+
 ### Remove files by tag

-You can access the tags of a file by `node.data.tags`.
+You can access the frontmatter of a file by `node.file?.frontmatter?`. This allows you to filter out files based on their frontmatter, for example by their tags.

 ```ts title="quartz.layout.ts"
 Component.Explorer({
  filterFn: (node) => {
    // exclude files with the tag "explorerexclude"
-    return node.data.tags.includes("explorerexclude") !== true
+    return node.file?.frontmatter?.tags?.includes("explorerexclude") !== true
  },
 })
 ```

 ### Show every element in explorer

-By default, the explorer will filter out the `tags` folder.
-To override the default filter function, you can set the filter function to `undefined`.
+To override the default filter function that removes the `tags` folder from the explorer, you can set the filter function to `undefined`.

 ```ts title="quartz.layout.ts"
 Component.Explorer({
@@ -179,12 +194,10 @@ Component.Explorer({

 > [!tip]
 > When writing more complicated functions, the `layout` file can start to look very cramped.
-> You can fix this by defining your sort functions outside of the component
-> and passing it in.
+> You can fix this by defining your functions in another file.
 >
-> ```ts title="quartz.layout.ts"
+> ```ts title="functions.ts"
 > import { Options } from "./quartz/components/ExplorerNode"
->
 > export const mapFn: Options["mapFn"] = (node) => {
 >   // implement your function here
 > }
@@ -194,12 +207,16 @@ Component.Explorer({
 > export const sortFn: Options["sortFn"] = (a, b) => {
 >   // implement your function here
 > }
+> ```
 >
+> You can then import them like this:
+>
+> ```ts title="quartz.layout.ts"
+> import { mapFn, filterFn, sortFn } from "./functions.ts"
 > Component.Explorer({
->   // ... your other options
->   mapFn,
->   filterFn,
->   sortFn,
+>   mapFn: mapFn,
+>   filterFn: filterFn,
+>   sortFn: sortFn,
 > })
 > ```

@@ -210,11 +227,93 @@ To add emoji prefixes (📁 for folders, 📄 for files), you could use a map fu
 ```ts title="quartz.layout.ts"
 Component.Explorer({
  mapFn: (node) => {
-    if (node.isFolder) {
-      node.displayName = "📁 " + node.displayName
-    } else {
+    // dont change name of root node
+    if (node.depth > 0) {
+      // set emoji for file/folder
+      if (node.file) {
        node.displayName = "📄 " + node.displayName
+      } else {
+        node.displayName = "📁 " + node.displayName
+      }
    }
  },
 })
 ```
+
+### Putting it all together
+
+In this example, we're going to customize the explorer by using functions from examples above to [[#Add emoji prefix | add emoji prefixes]], [[#remove-list-of-elements-filter| filter out some folders]] and [[#use-sort-to-put-files-first | sort with files above folders]].
+
+```ts title="quartz.layout.ts"
+Component.Explorer({
+  filterFn: sampleFilterFn,
+  mapFn: sampleMapFn,
+  sortFn: sampleSortFn,
+  order: ["filter", "sort", "map"],
+})
+```
+
+Notice how we customized the `order` array here. This is done because the default order applies the `sort` function last. While this normally works well, it would cause unintended behavior here, since we changed the first characters of all display names. In our example, `sort` would be applied based off the emoji prefix instead of the first _real_ character.
+
+To fix this, we just changed around the order and apply the `sort` function before changing the display names in the `map` function.
+
+### Use `sort` with pre-defined sort order
+
+Here's another example where a map containing file/folder names (as slugs) is used to define the sort order of the explorer in quartz. All files/folders that aren't listed inside of `nameOrderMap` will appear at the top of that folders hierarchy level.
+
+It's also worth mentioning, that the smaller the number set in `nameOrderMap`, the higher up the entry will be in the explorer. Incrementing every folder/file by 100, makes ordering files in their folders a lot easier. Lastly, this example still allows you to use a `mapFn` or frontmatter titles to change display names, as it uses slugs for `nameOrderMap` (which is unaffected by display name changes).
+
+```ts title="quartz.layout.ts"
+Component.Explorer({
+  sortFn: (a, b) => {
+    const nameOrderMap: Record<string, number> = {
+      "poetry-folder": 100,
+      "essay-folder": 200,
+      "research-paper-file": 201,
+      "dinosaur-fossils-file": 300,
+      "other-folder": 400,
+    }
+
+    let orderA = 0
+    let orderB = 0
+
+    if (a.file && a.file.slug) {
+      orderA = nameOrderMap[a.file.slug] || 0
+    } else if (a.name) {
+      orderA = nameOrderMap[a.name] || 0
+    }
+
+    if (b.file && b.file.slug) {
+      orderB = nameOrderMap[b.file.slug] || 0
+    } else if (b.name) {
+      orderB = nameOrderMap[b.name] || 0
+    }
+
+    return orderA - orderB
+  },
+})
+```
+
+For reference, this is how the quartz explorer window would look like with that example:
+
+```
+📖 Poetry Folder
+📑 Essay Folder
+    ⚗️ Research Paper File
+🦴 Dinosaur Fossils File
+🔮 Other Folder
+```
+
+And this is how the file structure would look like:
+
+```
+index.md
+poetry-folder
+    index.md
+essay-folder
+    index.md
+    research-paper-file.md
+dinosaur-fossils-file.md
+other-folder
+    index.md
+```
--- a/docs/features/social
+++ b/docs/features/social
@@ -2,18 +2,400 @@
 title: "Social Media Preview Cards"
 ---

-A lot of social media platforms can display a rich preview for your website when sharing a link (most notably, a cover image, a title and a description).
-
-Quartz can also dynamically generate and use new cover images for every page to be used in link previews on social media for you.
+A lot of social media platforms can display a rich preview for your website when sharing a link (most notably, a cover image, a title and a description). Quartz automatically handles most of this for you with reasonable defaults, but for more control, you can customize these by setting [[social images#Frontmatter Properties]].
+Quartz can also dynamically generate and use new cover images for every page to be used in link previews on social media for you. To get started with this, set `generateSocialImages: true` in `quartz.config.ts`.

 ## Showcase

-After enabling the [[CustomOgImages]] emitter plugin, the social media link preview for [[authoring content | Authoring Content]] looks like this:
+After enabling `generateSocialImages` in `quartz.config.ts`, the social media link preview for [[authoring content | Authoring Content]] looks like this:

 | Light                               | Dark                               |
 | ----------------------------------- | ---------------------------------- |
 | ![[social-image-preview-light.png]] | ![[social-image-preview-dark.png]] |

-## Configuration
+For testing, it is recommended to use [opengraph.xyz](https://www.opengraph.xyz/) to see what the link to your page will look like on various platforms (more info under [[social images#local testing]]).

-This functionality is provided by the [[CustomOgImages]] plugin. See the plugin page for customization options.
+## Customization
+
+You can customize how images will be generated in the quartz config.
+
+For example, here's what the default configuration looks like if you set `generateSocialImages: true`:
+
+```typescript title="quartz.config.ts"
+generateSocialImages: {
+  colorScheme: "lightMode", // what colors to use for generating image, same as theme colors from config, valid values are "darkMode" and "lightMode"
+  width: 1200, // width to generate with (in pixels)
+  height: 630, // height to generate with (in pixels)
+  excludeRoot: false, // wether to exclude "/" index path to be excluded from auto generated images (false = use auto, true = use default og image)
+}
+```
+
+---
+
+### Frontmatter Properties
+
+> [!tip] Hint
+>
+> Overriding social media preview properties via frontmatter still works even if `generateSocialImages` is disabled.
+
+The following properties can be used to customize your link previews:
+
+| Property            | Alias            | Summary                             |
+| ------------------- | ---------------- | ----------------------------------- |
+| `socialDescription` | `description`    | Description to be used for preview. |
+| `socialImage`       | `image`, `cover` | Link to preview image.              |
+
+The `socialImage` property should contain a link to an image relative to `quartz/static`. If you have a folder for all your images in `quartz/static/my-images`, an example for `socialImage` could be `"my-images/cover.png"`.
+
+> [!info] Info
+>
+> The priority for what image will be used for the cover image looks like the following: `frontmatter property > generated image (if enabled) > default image`.
+>
+> The default image (`quartz/static/og-image.png`) will only be used as a fallback if nothing else is set. If `generateSocialImages` is enabled, it will be treated as the new default per page, but can be overwritten by setting the `socialImage` frontmatter property for that page.
+
+---
+
+### Fully customized image generation
+
+You can fully customize how the images being generated look by passing your own component to `generateSocialImages.imageStructure`. This component takes html/css + some page metadata/config options and converts it to an image using [satori](https://github.com/vercel/satori). Vercel provides an [online playground](https://og-playground.vercel.app/) that can be used to preview how your html/css looks like as a picture. This is ideal for prototyping your custom design.
+
+It is recommended to write your own image components in `quartz/util/og.tsx` or any other `.tsx` file, as passing them to the config won't work otherwise. An example of the default image component can be found in `og.tsx` in `defaultImage()`.
+
+> [!tip] Hint
+>
+> Satori only supports a subset of all valid CSS properties. All supported properties can be found in their [documentation](https://github.com/vercel/satori#css).
+
+Your custom image component should have the `SocialImageOptions["imageStructure"]` type, to make development easier for you. Using a component of this type, you will be passed the following variables:
+
+```ts
+imageStructure: (
+  cfg: GlobalConfiguration, // global Quartz config (useful for getting theme colors and other info)
+  userOpts: UserOpts, // options passed to `generateSocialImage`
+  title: string, // title of current page
+  description: string, // description of current page
+  fonts: SatoriOptions["fonts"], // header + body font
+) => JSXInternal.Element
+```
+
+Now, you can let your creativity flow and design your own image component! For reference and some cool tips, you can check how the markup for the default image looks.
+
+> [!example] Examples
+>
+> Here are some examples for markup you may need to get started:
+>
+> - Get a theme color
+>
+>   `cfg.theme.colors[colorScheme].<colorName>`, where `<colorName>` corresponds to a key in `ColorScheme` (defined at the top of `quartz/util/theme.ts`)
+>
+> - Use the page title/description
+>
+>   `<p>{title}</p>`/`<p>{description}</p>`
+>
+> - Use a font family
+>
+>   Detailed in the Fonts chapter below
+
+---
+
+### Fonts
+
+You will also be passed an array containing a header and a body font (where the first entry is header and the second is body). The fonts matches the ones selected in `theme.typography.header` and `theme.typography.body` from `quartz.config.ts` and will be passed in the format required by [`satori`](https://github.com/vercel/satori). To use them in CSS, use the `.name` property (e.g. `fontFamily: fonts[1].name` to use the "body" font family).
+
+An example of a component using the header font could look like this:
+
+```tsx title="socialImage.tsx"
+export const myImage: SocialImageOptions["imageStructure"] = (...) => {
+  return <p style={{ fontFamily: fonts[0].name }}>Cool Header!</p>
+}
+```
+
+> [!example]- Local fonts
+>
+> For cases where you use a local fonts under `static` folder, make sure to set the correct `@font-face` in `custom.scss`
+>
+> ```scss title="custom.scss"
+> @font-face {
+>   font-family: "Newsreader";
+>   font-style: normal;
+>   font-weight: normal;
+>   font-display: swap;
+>   src: url("/static/Newsreader.woff2") format("woff2");
+> }
+> ```
+>
+> Then in `quartz/util/og.tsx`, you can load the satori fonts like so:
+>
+> ```tsx title="quartz/util/og.tsx"
+> const headerFont = joinSegments("static", "Newsreader.woff2")
+> const bodyFont = joinSegments("static", "Newsreader.woff2")
+>
+> export async function getSatoriFont(cfg: GlobalConfiguration): Promise<SatoriOptions["fonts"]> {
+>   const headerWeight: FontWeight = 700
+>   const bodyWeight: FontWeight = 400
+>
+>   const url = new URL(`https://${cfg.baseUrl ?? "example.com"}`)
+>
+>   const [header, body] = await Promise.all(
+>     [headerFont, bodyFont].map((font) =>
+>       fetch(`${url.toString()}/${font}`).then((res) => res.arrayBuffer()),
+>     ),
+>   )
+>
+>   return [
+>     { name: cfg.theme.typography.header, data: header, weight: headerWeight, style: "normal" },
+>     { name: cfg.theme.typography.body, data: body, weight: bodyWeight, style: "normal" },
+>   ]
+> }
+> ```
+>
+> This font then can be used with your custom structure
+
+### Local testing
+
+To test how the full preview of your page is going to look even before deploying, you can forward the port you're serving quartz on. In VSCode, this can easily be achieved following [this guide](https://code.visualstudio.com/docs/editor/port-forwarding) (make sure to set `Visibility` to `public` if testing on external tools like [opengraph.xyz](https://www.opengraph.xyz/)).
+
+If you have `generateSocialImages` enabled, you can check out all generated images under `public/static/social-images`.
+
+## Technical info
+
+Images will be generated as `.webp` files, which helps to keep images small (the average image takes ~`19kB`). They are also compressed further using [sharp](https://sharp.pixelplumbing.com/).
+
+When using images, the appropriate [Open Graph](https://ogp.me/) and [Twitter](https://developer.twitter.com/en/docs/twitter-for-websites/cards/guides/getting-started) meta tags will be set to ensure they work and look as expected.
+
+## Examples
+
+Besides the template for the default image generation (found under `quartz/util/og.tsx`), you can also add your own! To do this, you can either edit the source code of that file (not recommended) or create a new one (e.g. `customSocialImage.tsx`, source shown below).
+
+After adding that file, you can update `quartz.config.ts` to use your image generation template as follows:
+
+```ts
+// Import component at start of file
+import { customImage } from "./quartz/util/customSocialImage.tsx"
+
+// In main config
+const config: QuartzConfig = {
+  ...
+  generateSocialImages: {
+    ...
+    imageStructure: customImage, // tells quartz to use your component when generating images
+  },
+}
+```
+
+The following example will generate images that look as follows:
+
+| Light                                      | Dark                                      |
+| ------------------------------------------ | ----------------------------------------- |
+| ![[custom-social-image-preview-light.png]] | ![[custom-social-image-preview-dark.png]] |
+
+This example (and the default template) use colors and fonts from your theme specified in the quartz config. Fonts get passed in as a prop, where `fonts[0]` will contain the header font and `fonts[1]` will contain the body font (more info in the [[#fonts]] section).
+
+```tsx
+import { SatoriOptions } from "satori/wasm"
+import { GlobalConfiguration } from "../cfg"
+import { SocialImageOptions, UserOpts } from "./imageHelper"
+import { QuartzPluginData } from "../plugins/vfile"
+
+export const customImage: SocialImageOptions["imageStructure"] = (
+  cfg: GlobalConfiguration,
+  userOpts: UserOpts,
+  title: string,
+  description: string,
+  fonts: SatoriOptions["fonts"],
+  fileData: QuartzPluginData,
+) => {
+  // How many characters are allowed before switching to smaller font
+  const fontBreakPoint = 22
+  const useSmallerFont = title.length > fontBreakPoint
+
+  const { colorScheme } = userOpts
+  return (
+    <div
+      style={{
+        display: "flex",
+        flexDirection: "row",
+        justifyContent: "flex-start",
+        alignItems: "center",
+        height: "100%",
+        width: "100%",
+      }}
+    >
+      <div
+        style={{
+          display: "flex",
+          alignItems: "center",
+          justifyContent: "center",
+          height: "100%",
+          width: "100%",
+          backgroundColor: cfg.theme.colors[colorScheme].light,
+          flexDirection: "column",
+          gap: "2.5rem",
+          paddingTop: "2rem",
+          paddingBottom: "2rem",
+        }}
+      >
+        <p
+          style={{
+            color: cfg.theme.colors[colorScheme].dark,
+            fontSize: useSmallerFont ? 70 : 82,
+            marginLeft: "4rem",
+            textAlign: "center",
+            marginRight: "4rem",
+            fontFamily: fonts[0].name,
+          }}
+        >
+          {title}
+        </p>
+        <p
+          style={{
+            color: cfg.theme.colors[colorScheme].dark,
+            fontSize: 44,
+            marginLeft: "8rem",
+            marginRight: "8rem",
+            lineClamp: 3,
+            fontFamily: fonts[1].name,
+          }}
+        >
+          {description}
+        </p>
+      </div>
+      <div
+        style={{
+          height: "100%",
+          width: "2vw",
+          position: "absolute",
+          backgroundColor: cfg.theme.colors[colorScheme].tertiary,
+          opacity: 0.85,
+        }}
+      />
+    </div>
+  )
+}
+```
+
+> [!example]- Advanced example
+>
+> The following example includes a customized social image with a custom background and formatted date.
+>
+> ```typescript title="custom-og.tsx"
+> export const og: SocialImageOptions["Component"] = (
+>   cfg: GlobalConfiguration,
+>   fileData: QuartzPluginData,
+>   { colorScheme }: Options,
+>   title: string,
+>   description: string,
+>   fonts: SatoriOptions["fonts"],
+> ) => {
+>   let created: string | undefined
+>   let reading: string | undefined
+>   if (fileData.dates) {
+>     created = formatDate(getDate(cfg, fileData)!, cfg.locale)
+>   }
+>   const { minutes, text: _timeTaken, words: _words } = readingTime(fileData.text!)
+>   reading = i18n(cfg.locale).components.contentMeta.readingTime({
+>     minutes: Math.ceil(minutes),
+>   })
+>
+>   const Li = [created, reading]
+>
+>   return (
+>     <div
+>       style={{
+>         position: "relative",
+>         display: "flex",
+>         flexDirection: "row",
+>         alignItems: "flex-start",
+>         height: "100%",
+>         width: "100%",
+>         backgroundImage: `url("https://${cfg.baseUrl}/static/og-image.jpeg")`,
+>         backgroundSize: "100% 100%",
+>       }}
+>     >
+>       <div
+>         style={{
+>           position: "absolute",
+>           top: 0,
+>           left: 0,
+>           right: 0,
+>           bottom: 0,
+>           background: "radial-gradient(circle at center, transparent, rgba(0, 0, 0, 0.4) 70%)",
+>         }}
+>       />
+>       <div
+>         style={{
+>           display: "flex",
+>           height: "100%",
+>           width: "100%",
+>           flexDirection: "column",
+>           justifyContent: "flex-start",
+>           alignItems: "flex-start",
+>           gap: "1.5rem",
+>           paddingTop: "4rem",
+>           paddingBottom: "4rem",
+>           marginLeft: "4rem",
+>         }}
+>       >
+>         <img
+>           src={`"https://${cfg.baseUrl}/static/icon.jpeg"`}
+>           style={{
+>             position: "relative",
+>             backgroundClip: "border-box",
+>             borderRadius: "6rem",
+>           }}
+>           width={80}
+>         />
+>         <div
+>           style={{
+>             display: "flex",
+>             flexDirection: "column",
+>             textAlign: "left",
+>             fontFamily: fonts[0].name,
+>           }}
+>         >
+>           <h2
+>             style={{
+>               color: cfg.theme.colors[colorScheme].light,
+>               fontSize: "3rem",
+>               fontWeight: 700,
+>               marginRight: "4rem",
+>               fontFamily: fonts[0].name,
+>             }}
+>           >
+>             {title}
+>           </h2>
+>           <ul
+>             style={{
+>               color: cfg.theme.colors[colorScheme].gray,
+>               gap: "1rem",
+>               fontSize: "1.5rem",
+>               fontFamily: fonts[1].name,
+>             }}
+>           >
+>             {Li.map((item, index) => {
+>               if (item) {
+>                 return <li key={index}>{item}</li>
+>               }
+>             })}
+>           </ul>
+>         </div>
+>         <p
+>           style={{
+>             color: cfg.theme.colors[colorScheme].light,
+>             fontSize: "1.5rem",
+>             overflow: "hidden",
+>             marginRight: "8rem",
+>             textOverflow: "ellipsis",
+>             display: "-webkit-box",
+>             WebkitLineClamp: 7,
+>             WebkitBoxOrient: "vertical",
+>             lineClamp: 7,
+>             fontFamily: fonts[1].name,
+>           }}
+>         >
+>           {description}
+>         </p>
+>       </div>
+>     </div>
+>   )
+> }
+> ```
--- a/docs/index.md
+++ b/docs/index.md
@@ -31,13 +31,13 @@ If you prefer instructions in a video format you can try following Nicole van de

 ## 🔧 Features

- [[Obsidian compatibility]], [[full-text search]], [[graph view]], note transclusion, [[wikilinks]], [[backlinks]], [[features/Latex|Latex]], [[syntax highlighting]], [[popover previews]], [[Docker Support]], [[i18n|internationalization]], [[comments]] and [many more](./features/) right out of the box
+- [[Obsidian compatibility]], [[full-text search]], [[graph view]], note transclusion, [[wikilinks]], [[backlinks]], [[features/Latex|Latex]], [[syntax highlighting]], [[popover previews]], [[Docker Support]], [[i18n|internationalization]], [[comments]] and [many more](./features) right out of the box
 - Hot-reload for both configuration and content
 - Simple JSX layouts and [[creating components|page components]]
 - [[SPA Routing|Ridiculously fast page loads]] and tiny bundle sizes
 - Fully-customizable parsing, filtering, and page generation through [[making plugins|plugins]]

-For a comprehensive list of features, visit the [features page](./features/). You can read more about the _why_ behind these features on the [[philosophy]] page and a technical overview on the [[architecture]] page.
+For a comprehensive list of features, visit the [features page](/features). You can read more about the _why_ behind these features on the [[philosophy]] page and a technical overview on the [[architecture]] page.

 ### 🚧 Troubleshooting + Updating

--- a/docs/layout-components.md
+++ b/docs/layout-components.md
@@ -1,62 +0,0 @@
---
-title: Higher-Order Layout Components
---
-
-Quartz provides several higher-order components that help with layout composition and responsive design. These components wrap other components to add additional functionality or modify their behavior.
-
-## `Flex` Component
-
-The `Flex` component creates a [flexible box layout](https://developer.mozilla.org/en-US/docs/Web/CSS/flex) that can arrange child components in various ways. It's particularly useful for creating responsive layouts and organizing components in rows or columns.
-
-```typescript
-type FlexConfig = {
-  components: {
-    Component: QuartzComponent
-    grow?: boolean // whether component should grow to fill space
-    shrink?: boolean // whether component should shrink if needed
-    basis?: string // initial main size of the component
-    order?: number // order in flex container
-    align?: "start" | "end" | "center" | "stretch" // cross-axis alignment
-    justify?: "start" | "end" | "center" | "between" | "around" // main-axis alignment
-  }[]
-  direction?: "row" | "row-reverse" | "column" | "column-reverse"
-  wrap?: "nowrap" | "wrap" | "wrap-reverse"
-  gap?: string
-}
-```
-
-### Example Usage
-
-```typescript
-Component.Flex({
-  components: [
-    {
-      Component: Component.Search(),
-      grow: true, // Search will grow to fill available space
-    },
-    { Component: Component.Darkmode() }, // Darkmode keeps its natural size
-  ],
-  direction: "row",
-  gap: "1rem",
-})
-```
-
-## `MobileOnly` Component
-
-The `MobileOnly` component is a wrapper that makes its child component only visible on mobile devices. This is useful for creating responsive layouts where certain components should only appear on smaller screens.
-
-### Example Usage
-
-```typescript
-Component.MobileOnly(Component.Spacer())
-```
-
-## `DesktopOnly` Component
-
-The `DesktopOnly` component is the counterpart to `MobileOnly`. It makes its child component only visible on desktop devices. This helps create responsive layouts where certain components should only appear on larger screens.
-
-### Example Usage
-
-```typescript
-Component.DesktopOnly(Component.TableOfContents())
-```
--- a/docs/layout.md
+++ b/docs/layout.md
@@ -35,9 +35,7 @@ These correspond to following parts of the page:

 Quartz **components**, like plugins, can take in additional properties as configuration options. If you're familiar with React terminology, you can think of them as Higher-order Components.

-See [a list of all the components](component.md) for all available components along with their configuration options. Additionally, Quartz provides several built-in higher-order components for layout composition - see [[layout-components]] for more details.
-
-You can also checkout the guide on [[creating components]] if you're interested in further customizing the behaviour of Quartz.
+See [a list of all the components](component.md) for all available components along with their configuration options. You can also checkout the guide on [[creating components]] if you're interested in further customizing the behaviour of Quartz.

 ### Layout breakpoints

--- a/docs/plugins/CustomOgImages.md
+++ b/docs/plugins/CustomOgImages.md
@@ -1,352 +0,0 @@
---
-title: Custom OG Images
-tags:
-  - feature/emitter
---
-
-The Custom OG Images emitter plugin generates social media preview images for your pages. It uses [satori](https://github.com/vercel/satori) to convert HTML/CSS into images, allowing you to create beautiful and consistent social media preview cards for your content.
-
-> [!note]
-> For information on how to add, remove or configure plugins, see the [[configuration#Plugins|Configuration]] page.
-
-## Features
-
- Automatically generates social media preview images for each page
- Supports both light and dark mode themes
- Customizable through frontmatter properties
- Fallback to default image when needed
- Full control over image design through custom components
-
-## Configuration
-
-> [!info] Info
->
-> The `baseUrl` property in your [[configuration]] must be set properly for social images to work correctly, as they require absolute paths.
-
-This plugin accepts the following configuration options:
-
-```typescript title="quartz.config.ts"
-import { CustomOgImages } from "./quartz/plugins/emitters/ogImage"
-
-const config: QuartzConfig = {
-  plugins: {
-    emitters: [
-      CustomOgImages({
-        colorScheme: "lightMode", // what colors to use for generating image, same as theme colors from config, valid values are "darkMode" and "lightMode"
-        width: 1200, // width to generate with (in pixels)
-        height: 630, // height to generate with (in pixels)
-        excludeRoot: false, // wether to exclude "/" index path to be excluded from auto generated images (false = use auto, true = use default og image)
-        imageStructure: defaultImage, // custom image component to use
-      }),
-    ],
-  },
-}
-```
-
-### Configuration Options
-
-| Option           | Type      | Default      | Description                                                       |
-| ---------------- | --------- | ------------ | ----------------------------------------------------------------- |
-| `colorScheme`    | string    | "lightMode"  | Theme to use for generating images ("darkMode" or "lightMode")    |
-| `width`          | number    | 1200         | Width of the generated image in pixels                            |
-| `height`         | number    | 630          | Height of the generated image in pixels                           |
-| `excludeRoot`    | boolean   | false        | Whether to exclude the root index page from auto-generated images |
-| `imageStructure` | component | defaultImage | Custom component to use for image generation                      |
-
-## Frontmatter Properties
-
-The following properties can be used to customize your link previews:
-
-| Property            | Alias            | Summary                             |
-| ------------------- | ---------------- | ----------------------------------- |
-| `socialDescription` | `description`    | Description to be used for preview. |
-| `socialImage`       | `image`, `cover` | Link to preview image.              |
-
-The `socialImage` property should contain a link to an image relative to `quartz/static`. If you have a folder for all your images in `quartz/static/my-images`, an example for `socialImage` could be `"my-images/cover.png"`.
-
-> [!info] Info
->
-> The priority for what image will be used for the cover image looks like the following: `frontmatter property > generated image (if enabled) > default image`.
->
-> The default image (`quartz/static/og-image.png`) will only be used as a fallback if nothing else is set. If the Custom OG Images emitter plugin is enabled, it will be treated as the new default per page, but can be overwritten by setting the `socialImage` frontmatter property for that page.
-
-## Customization
-
-You can fully customize how the images being generated look by passing your own component to `imageStructure`. This component takes JSX + some page metadata/config options and converts it to an image using [satori](https://github.com/vercel/satori). Vercel provides an [online playground](https://og-playground.vercel.app/) that can be used to preview how your JSX looks like as a picture. This is ideal for prototyping your custom design.
-
-### Fonts
-
-You will also be passed an array containing a header and a body font (where the first entry is header and the second is body). The fonts matches the ones selected in `theme.typography.header` and `theme.typography.body` from `quartz.config.ts` and will be passed in the format required by [`satori`](https://github.com/vercel/satori). To use them in CSS, use the `.name` property (e.g. `fontFamily: fonts[1].name` to use the "body" font family).
-
-An example of a component using the header font could look like this:
-
-```tsx title="socialImage.tsx"
-export const myImage: SocialImageOptions["imageStructure"] = (...) => {
-  return <p style={{ fontFamily: fonts[0].name }}>Cool Header!</p>
-}
-```
-
-> [!example]- Local fonts
->
-> For cases where you use a local fonts under `static` folder, make sure to set the correct `@font-face` in `custom.scss`
->
-> ```scss title="custom.scss"
-> @font-face {
->   font-family: "Newsreader";
->   font-style: normal;
->   font-weight: normal;
->   font-display: swap;
->   src: url("/static/Newsreader.woff2") format("woff2");
-> }
-> ```
->
-> Then in `quartz/util/og.tsx`, you can load the Satori fonts like so:
->
-> ```tsx title="quartz/util/og.tsx"
-> import { joinSegments, QUARTZ } from "../path"
-> import fs from "fs"
-> import path from "path"
->
-> const headerFont = joinSegments(QUARTZ, "static", "Newsreader.woff2")
-> const bodyFont = joinSegments(QUARTZ, "static", "Newsreader.woff2")
->
-> export async function getSatoriFont(cfg: GlobalConfiguration): Promise<SatoriOptions["fonts"]> {
->   const headerWeight: FontWeight = 700
->   const bodyWeight: FontWeight = 400
->
->   const [header, body] = await Promise.all(
->     [headerFont, bodyFont].map((font) => 
->       fs.promises.readFile(path.resolve(font))
->     ),
->   )
->
->   return [
->     { name: cfg.theme.typography.header, data: header, weight: headerWeight, style: "normal" },
->     { name: cfg.theme.typography.body, data: body, weight: bodyWeight, style: "normal" },
->   ]
-> }
-> ```
->
-> This font then can be used with your custom structure
-
-## Examples
-
-Here are some example image components you can use as a starting point:
-
-### Basic Example
-
-This example will generate images that look as follows:
-
-| Light                                      | Dark                                      |
-| ------------------------------------------ | ----------------------------------------- |
-| ![[custom-social-image-preview-light.png]] | ![[custom-social-image-preview-dark.png]] |
-
-```tsx
-import { SatoriOptions } from "satori/wasm"
-import { GlobalConfiguration } from "../cfg"
-import { SocialImageOptions, UserOpts } from "./imageHelper"
-import { QuartzPluginData } from "../plugins/vfile"
-
-export const customImage: SocialImageOptions["imageStructure"] = (
-  cfg: GlobalConfiguration,
-  userOpts: UserOpts,
-  title: string,
-  description: string,
-  fonts: SatoriOptions["fonts"],
-  fileData: QuartzPluginData,
-) => {
-  // How many characters are allowed before switching to smaller font
-  const fontBreakPoint = 22
-  const useSmallerFont = title.length > fontBreakPoint
-
-  const { colorScheme } = userOpts
-  return (
-    <div
-      style={{
-        display: "flex",
-        flexDirection: "row",
-        justifyContent: "flex-start",
-        alignItems: "center",
-        height: "100%",
-        width: "100%",
-      }}
-    >
-      <div
-        style={{
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "center",
-          height: "100%",
-          width: "100%",
-          backgroundColor: cfg.theme.colors[colorScheme].light,
-          flexDirection: "column",
-          gap: "2.5rem",
-          paddingTop: "2rem",
-          paddingBottom: "2rem",
-        }}
-      >
-        <p
-          style={{
-            color: cfg.theme.colors[colorScheme].dark,
-            fontSize: useSmallerFont ? 70 : 82,
-            marginLeft: "4rem",
-            textAlign: "center",
-            marginRight: "4rem",
-            fontFamily: fonts[0].name,
-          }}
-        >
-          {title}
-        </p>
-        <p
-          style={{
-            color: cfg.theme.colors[colorScheme].dark,
-            fontSize: 44,
-            marginLeft: "8rem",
-            marginRight: "8rem",
-            lineClamp: 3,
-            fontFamily: fonts[1].name,
-          }}
-        >
-          {description}
-        </p>
-      </div>
-      <div
-        style={{
-          height: "100%",
-          width: "2vw",
-          position: "absolute",
-          backgroundColor: cfg.theme.colors[colorScheme].tertiary,
-          opacity: 0.85,
-        }}
-      />
-    </div>
-  )
-}
-```
-
-### Advanced Example
-
-The following example includes a customized social image with a custom background and formatted date:
-
-```typescript title="custom-og.tsx"
-export const og: SocialImageOptions["Component"] = (
-  cfg: GlobalConfiguration,
-  fileData: QuartzPluginData,
-  { colorScheme }: Options,
-  title: string,
-  description: string,
-  fonts: SatoriOptions["fonts"],
-) => {
-  let created: string | undefined
-  let reading: string | undefined
-  if (fileData.dates) {
-    created = formatDate(getDate(cfg, fileData)!, cfg.locale)
-  }
-  const { minutes, text: _timeTaken, words: _words } = readingTime(fileData.text!)
-  reading = i18n(cfg.locale).components.contentMeta.readingTime({
-    minutes: Math.ceil(minutes),
-  })
-
-  const Li = [created, reading]
-
-  return (
-    <div
-      style={{
-        position: "relative",
-        display: "flex",
-        flexDirection: "row",
-        alignItems: "flex-start",
-        height: "100%",
-        width: "100%",
-        backgroundImage: `url("https://${cfg.baseUrl}/static/og-image.jpeg")`,
-        backgroundSize: "100% 100%",
-      }}
-    >
-      <div
-        style={{
-          position: "absolute",
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          background: "radial-gradient(circle at center, transparent, rgba(0, 0, 0, 0.4) 70%)",
-        }}
-      />
-      <div
-        style={{
-          display: "flex",
-          height: "100%",
-          width: "100%",
-          flexDirection: "column",
-          justifyContent: "flex-start",
-          alignItems: "flex-start",
-          gap: "1.5rem",
-          paddingTop: "4rem",
-          paddingBottom: "4rem",
-          marginLeft: "4rem",
-        }}
-      >
-        <img
-          src={`"https://${cfg.baseUrl}/static/icon.jpeg"`}
-          style={{
-            position: "relative",
-            backgroundClip: "border-box",
-            borderRadius: "6rem",
-          }}
-          width={80}
-        />
-        <div
-          style={{
-            display: "flex",
-            flexDirection: "column",
-            textAlign: "left",
-            fontFamily: fonts[0].name,
-          }}
-        >
-          <h2
-            style={{
-              color: cfg.theme.colors[colorScheme].light,
-              fontSize: "3rem",
-              fontWeight: 700,
-              marginRight: "4rem",
-              fontFamily: fonts[0].name,
-            }}
-          >
-            {title}
-          </h2>
-          <ul
-            style={{
-              color: cfg.theme.colors[colorScheme].gray,
-              gap: "1rem",
-              fontSize: "1.5rem",
-              fontFamily: fonts[1].name,
-            }}
-          >
-            {Li.map((item, index) => {
-              if (item) {
-                return <li key={index}>{item}</li>
-              }
-            })}
-          </ul>
-        </div>
-        <p
-          style={{
-            color: cfg.theme.colors[colorScheme].light,
-            fontSize: "1.5rem",
-            overflow: "hidden",
-            marginRight: "8rem",
-            textOverflow: "ellipsis",
-            display: "-webkit-box",
-            WebkitLineClamp: 7,
-            WebkitBoxOrient: "vertical",
-            lineClamp: 7,
-            fontFamily: fonts[1].name,
-          }}
-        >
-          {description}
-        </p>
-      </div>
-    </div>
-  )
-}
-```
--- a/docs/showcase.md
+++ b/docs/showcase.md
@@ -32,3 +32,5 @@ Want to see what Quartz can do? Here are some cool community gardens:
 - [🌓 Projects & Privacy - FOSS, tech, law](https://be-far.com)
 - [Zen Browser Docs](https://docs.zen-browser.app)
 - [🪴8cat life](https://8cat.life)
+
+If you want to see your own on here, submit a [Pull Request adding yourself to this file](https://github.com/jackyzha0/quartz/blob/v4/docs/showcase.md)!
--- a/index.d.ts
+++ b/index.d.ts
@@ -10,5 +10,4 @@ interface CustomEventMap {
  themechange: CustomEvent<{ theme: "light" | "dark" }>
 }

-type ContentIndex = Record<FullSlug, ContentDetails>
 declare const fetchData: Promise<ContentIndex>
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,11 +25,11 @@
        "globby": "^14.1.0",
        "gray-matter": "^4.0.3",
        "hast-util-to-html": "^9.0.5",
-        "hast-util-to-jsx-runtime": "^2.3.6",
+        "hast-util-to-jsx-runtime": "^2.3.5",
        "hast-util-to-string": "^3.0.1",
        "is-absolute-url": "^4.0.1",
        "js-yaml": "^4.1.0",
-        "lightningcss": "^1.29.2",
+        "lightningcss": "^1.29.1",
        "mdast-util-find-and-replace": "^3.0.2",
        "mdast-util-to-hast": "^13.2.0",
        "mdast-util-to-string": "^4.0.0",
@@ -79,12 +79,12 @@
        "@types/d3": "^7.4.3",
        "@types/hast": "^3.0.4",
        "@types/js-yaml": "^4.0.9",
-        "@types/node": "^22.13.10",
+        "@types/node": "^22.13.9",
        "@types/pretty-time": "^1.1.5",
        "@types/source-map-support": "^0.5.10",
-        "@types/ws": "^8.18.0",
+        "@types/ws": "^8.5.14",
        "@types/yargs": "^17.0.33",
-        "esbuild": "^0.25.1",
+        "esbuild": "^0.25.0",
        "prettier": "^3.5.3",
        "tsx": "^4.19.3",
        "typescript": "^5.8.2"
@@ -207,9 +207,9 @@
      }
    },
    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.1.tgz",
-      "integrity": "sha512-kfYGy8IdzTGy+z0vFGvExZtxkFlA4zAxgKEahG9KE1ScBjpQnFsNOX8KTU5ojNru5ed5CVoJYXFtoxaq5nFbjQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
+      "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==",
      "cpu": [
        "ppc64"
      ],
@@ -223,9 +223,9 @@
      }
    },
    "node_modules/@esbuild/android-arm": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.1.tgz",
-      "integrity": "sha512-dp+MshLYux6j/JjdqVLnMglQlFu+MuVeNrmT5nk6q07wNhCdSnB7QZj+7G8VMUGh1q+vj2Bq8kRsuyA00I/k+Q==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.0.tgz",
+      "integrity": "sha512-PTyWCYYiU0+1eJKmw21lWtC+d08JDZPQ5g+kFyxP0V+es6VPPSUhM6zk8iImp2jbV6GwjX4pap0JFbUQN65X1g==",
      "cpu": [
        "arm"
      ],
@@ -239,9 +239,9 @@
      }
    },
    "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.1.tgz",
-      "integrity": "sha512-50tM0zCJW5kGqgG7fQ7IHvQOcAn9TKiVRuQ/lN0xR+T2lzEFvAi1ZcS8DiksFcEpf1t/GYOeOfCAgDHFpkiSmA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.0.tgz",
+      "integrity": "sha512-grvv8WncGjDSyUBjN9yHXNt+cq0snxXbDxy5pJtzMKGmmpPxeAmAhWxXI+01lU5rwZomDgD3kJwulEnhTRUd6g==",
      "cpu": [
        "arm64"
      ],
@@ -255,9 +255,9 @@
      }
    },
    "node_modules/@esbuild/android-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.1.tgz",
-      "integrity": "sha512-GCj6WfUtNldqUzYkN/ITtlhwQqGWu9S45vUXs7EIYf+7rCiiqH9bCloatO9VhxsL0Pji+PF4Lz2XXCES+Q8hDw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.0.tgz",
+      "integrity": "sha512-m/ix7SfKG5buCnxasr52+LI78SQ+wgdENi9CqyCXwjVR2X4Jkz+BpC3le3AoBPYTC9NHklwngVXvbJ9/Akhrfg==",
      "cpu": [
        "x64"
      ],
@@ -271,9 +271,9 @@
      }
    },
    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.1.tgz",
-      "integrity": "sha512-5hEZKPf+nQjYoSr/elb62U19/l1mZDdqidGfmFutVUjjUZrOazAtwK+Kr+3y0C/oeJfLlxo9fXb1w7L+P7E4FQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.0.tgz",
+      "integrity": "sha512-mVwdUb5SRkPayVadIOI78K7aAnPamoeFR2bT5nszFUZ9P8UpK4ratOdYbZZXYSqPKMHfS1wdHCJk1P1EZpRdvw==",
      "cpu": [
        "arm64"
      ],
@@ -287,9 +287,9 @@
      }
    },
    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.1.tgz",
-      "integrity": "sha512-hxVnwL2Dqs3fM1IWq8Iezh0cX7ZGdVhbTfnOy5uURtao5OIVCEyj9xIzemDi7sRvKsuSdtCAhMKarxqtlyVyfA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.0.tgz",
+      "integrity": "sha512-DgDaYsPWFTS4S3nWpFcMn/33ZZwAAeAFKNHNa1QN0rI4pUjgqf0f7ONmXf6d22tqTY+H9FNdgeaAa+YIFUn2Rg==",
      "cpu": [
        "x64"
      ],
@@ -303,9 +303,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-1MrCZs0fZa2g8E+FUo2ipw6jw5qqQiH+tERoS5fAfKnRx6NXH31tXBKI3VpmLijLH6yriMZsxJtaXUyFt/8Y4A==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-VN4ocxy6dxefN1MepBx/iD1dH5K8qNtNe227I0mnTRjry8tj5MRk4zprLEdG8WPyAPb93/e4pSgi1SoHdgOa4w==",
      "cpu": [
        "arm64"
      ],
@@ -319,9 +319,9 @@
      }
    },
    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.1.tgz",
-      "integrity": "sha512-0IZWLiTyz7nm0xuIs0q1Y3QWJC52R8aSXxe40VUxm6BB1RNmkODtW6LHvWRrGiICulcX7ZvyH6h5fqdLu4gkww==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.0.tgz",
+      "integrity": "sha512-mrSgt7lCh07FY+hDD1TxiTyIHyttn6vnjesnPoVDNmDfOmggTLXRv8Id5fNZey1gl/V2dyVK1VXXqVsQIiAk+A==",
      "cpu": [
        "x64"
      ],
@@ -335,9 +335,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.1.tgz",
-      "integrity": "sha512-NdKOhS4u7JhDKw9G3cY6sWqFcnLITn6SqivVArbzIaf3cemShqfLGHYMx8Xlm/lBit3/5d7kXvriTUGa5YViuQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.0.tgz",
+      "integrity": "sha512-vkB3IYj2IDo3g9xX7HqhPYxVkNQe8qTK55fraQyTzTX/fxaDtXiEnavv9geOsonh2Fd2RMB+i5cbhu2zMNWJwg==",
      "cpu": [
        "arm"
      ],
@@ -351,9 +351,9 @@
      }
    },
    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.1.tgz",
-      "integrity": "sha512-jaN3dHi0/DDPelk0nLcXRm1q7DNJpjXy7yWaWvbfkPvI+7XNSc/lDOnCLN7gzsyzgu6qSAmgSvP9oXAhP973uQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.0.tgz",
+      "integrity": "sha512-9QAQjTWNDM/Vk2bgBl17yWuZxZNQIF0OUUuPZRKoDtqF2k4EtYbpyiG5/Dk7nqeK6kIJWPYldkOcBqjXjrUlmg==",
      "cpu": [
        "arm64"
      ],
@@ -367,9 +367,9 @@
      }
    },
    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.1.tgz",
-      "integrity": "sha512-OJykPaF4v8JidKNGz8c/q1lBO44sQNUQtq1KktJXdBLn1hPod5rE/Hko5ugKKZd+D2+o1a9MFGUEIUwO2YfgkQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.0.tgz",
+      "integrity": "sha512-43ET5bHbphBegyeqLb7I1eYn2P/JYGNmzzdidq/w0T8E2SsYL1U6un2NFROFRg1JZLTzdCoRomg8Rvf9M6W6Gg==",
      "cpu": [
        "ia32"
      ],
@@ -383,9 +383,9 @@
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.1.tgz",
-      "integrity": "sha512-nGfornQj4dzcq5Vp835oM/o21UMlXzn79KobKlcs3Wz9smwiifknLy4xDCLUU0BWp7b/houtdrgUz7nOGnfIYg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.0.tgz",
+      "integrity": "sha512-fC95c/xyNFueMhClxJmeRIj2yrSMdDfmqJnyOY4ZqsALkDrrKJfIg5NTMSzVBr5YW1jf+l7/cndBfP3MSDpoHw==",
      "cpu": [
        "loong64"
      ],
@@ -399,9 +399,9 @@
      }
    },
    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.1.tgz",
-      "integrity": "sha512-1osBbPEFYwIE5IVB/0g2X6i1qInZa1aIoj1TdL4AaAb55xIIgbg8Doq6a5BzYWgr+tEcDzYH67XVnTmUzL+nXg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.0.tgz",
+      "integrity": "sha512-nkAMFju7KDW73T1DdH7glcyIptm95a7Le8irTQNO/qtkoyypZAnjchQgooFUDQhNAy4iu08N79W4T4pMBwhPwQ==",
      "cpu": [
        "mips64el"
      ],
@@ -415,9 +415,9 @@
      }
    },
    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.1.tgz",
-      "integrity": "sha512-/6VBJOwUf3TdTvJZ82qF3tbLuWsscd7/1w+D9LH0W/SqUgM5/JJD0lrJ1fVIfZsqB6RFmLCe0Xz3fmZc3WtyVg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.0.tgz",
+      "integrity": "sha512-NhyOejdhRGS8Iwv+KKR2zTq2PpysF9XqY+Zk77vQHqNbo/PwZCzB5/h7VGuREZm1fixhs4Q/qWRSi5zmAiO4Fw==",
      "cpu": [
        "ppc64"
      ],
@@ -431,9 +431,9 @@
      }
    },
    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.1.tgz",
-      "integrity": "sha512-nSut/Mx5gnilhcq2yIMLMe3Wl4FK5wx/o0QuuCLMtmJn+WeWYoEGDN1ipcN72g1WHsnIbxGXd4i/MF0gTcuAjQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.0.tgz",
+      "integrity": "sha512-5S/rbP5OY+GHLC5qXp1y/Mx//e92L1YDqkiBbO9TQOvuFXM+iDqUNG5XopAnXoRH3FjIUDkeGcY1cgNvnXp/kA==",
      "cpu": [
        "riscv64"
      ],
@@ -447,9 +447,9 @@
      }
    },
    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.1.tgz",
-      "integrity": "sha512-cEECeLlJNfT8kZHqLarDBQso9a27o2Zd2AQ8USAEoGtejOrCYHNtKP8XQhMDJMtthdF4GBmjR2au3x1udADQQQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.0.tgz",
+      "integrity": "sha512-XM2BFsEBz0Fw37V0zU4CXfcfuACMrppsMFKdYY2WuTS3yi8O1nFOhil/xhKTmE1nPmVyvQJjJivgDT+xh8pXJA==",
      "cpu": [
        "s390x"
      ],
@@ -463,9 +463,9 @@
      }
    },
    "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.1.tgz",
-      "integrity": "sha512-xbfUhu/gnvSEg+EGovRc+kjBAkrvtk38RlerAzQxvMzlB4fXpCFCeUAYzJvrnhFtdeyVCDANSjJvOvGYoeKzFA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.0.tgz",
+      "integrity": "sha512-9yl91rHw/cpwMCNytUDxwj2XjFpxML0y9HAOH9pNVQDpQrBxHy01Dx+vaMu0N1CKa/RzBD2hB4u//nfc+Sd3Cw==",
      "cpu": [
        "x64"
      ],
@@ -479,9 +479,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-O96poM2XGhLtpTh+s4+nP7YCCAfb4tJNRVZHfIE7dgmax+yMP2WgMd2OecBuaATHKTHsLWHQeuaxMRnCsH8+5g==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-RuG4PSMPFfrkH6UwCAqBzauBWTygTvb1nxWasEJooGSJ/NwRw7b2HOwyRTQIU97Hq37l3npXoZGYMy3b3xYvPw==",
      "cpu": [
        "arm64"
      ],
@@ -495,9 +495,9 @@
      }
    },
    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.1.tgz",
-      "integrity": "sha512-X53z6uXip6KFXBQ+Krbx25XHV/NCbzryM6ehOAeAil7X7oa4XIq+394PWGnwaSQ2WRA0KI6PUO6hTO5zeF5ijA==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-jl+qisSB5jk01N5f7sPCsBENCOlPiS/xptD5yxOx2oqQfyourJwIKLRA2yqWdifj3owQZCL2sn6o08dBzZGQzA==",
      "cpu": [
        "x64"
      ],
@@ -510,26 +510,10 @@
        "node": ">=18"
      }
    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.1.tgz",
-      "integrity": "sha512-Na9T3szbXezdzM/Kfs3GcRQNjHzM6GzFBeU1/6IV/npKP5ORtp9zbQjvkDJ47s6BCgaAZnnnu/cY1x342+MvZg==",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.1.tgz",
-      "integrity": "sha512-T3H78X2h1tszfRSf+txbt5aOp/e7TAz3ptVKu9Oyir3IAOFPGV6O9c2naym5TOriy1l0nNf6a4X5UXRZSGX/dw==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.0.tgz",
+      "integrity": "sha512-2gwwriSMPcCFRlPlKx3zLQhfN/2WjJ2NSlg5TKLQOJdV0mSxIcYNTMhk3H3ulL/cak+Xj0lY1Ym9ysDV1igceg==",
      "cpu": [
        "x64"
      ],
@@ -543,9 +527,9 @@
      }
    },
    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.1.tgz",
-      "integrity": "sha512-2H3RUvcmULO7dIE5EWJH8eubZAI4xw54H1ilJnRNZdeo8dTADEZ21w6J22XBkXqGJbe0+wnNJtw3UXRoLJnFEg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.0.tgz",
+      "integrity": "sha512-bxI7ThgLzPrPz484/S9jLlvUAHYMzy6I0XiU1ZMeAEOBcS0VePBFxh1JjTQt3Xiat5b6Oh4x7UC7IwKQKIJRIg==",
      "cpu": [
        "x64"
      ],
@@ -559,9 +543,9 @@
      }
    },
    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.1.tgz",
-      "integrity": "sha512-GE7XvrdOzrb+yVKB9KsRMq+7a2U/K5Cf/8grVFRAGJmfADr/e/ODQ134RK2/eeHqYV5eQRFxb1hY7Nr15fv1NQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.0.tgz",
+      "integrity": "sha512-ZUAc2YK6JW89xTbXvftxdnYy3m4iHIkDtK3CLce8wg8M2L+YZhIvO1DKpxrd0Yr59AeNNkTiic9YLf6FTtXWMw==",
      "cpu": [
        "arm64"
      ],
@@ -575,9 +559,9 @@
      }
    },
    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.1.tgz",
-      "integrity": "sha512-uOxSJCIcavSiT6UnBhBzE8wy3n0hOkJsBOzy7HDAuTDE++1DJMRRVCPGisULScHL+a/ZwdXPpXD3IyFKjA7K8A==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.0.tgz",
+      "integrity": "sha512-eSNxISBu8XweVEWG31/JzjkIGbGIJN/TrRoiSVZwZ6pkC6VX4Im/WV2cz559/TXLcYbcrDN8JtKgd9DJVIo8GA==",
      "cpu": [
        "ia32"
      ],
@@ -591,9 +575,9 @@
      }
    },
    "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.1.tgz",
-      "integrity": "sha512-Y1EQdcfwMSeQN/ujR5VayLOJ1BHaK+ssyk0AEzPjC+t1lITgsnccPqFjb6V+LsTp/9Iov4ysfjxLaGJ9RPtkVg==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.0.tgz",
+      "integrity": "sha512-ZENoHJBxA20C2zFzh6AI4fT6RraMzjYw4xKWemRTRmRVtN9c5DcH9r/f2ihEkMjOW5eGgrwCslG/+Y/3bL+DHQ==",
      "cpu": [
        "x64"
      ],
@@ -1932,9 +1916,9 @@
      }
    },
    "node_modules/@types/node": {
-      "version": "22.13.10",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.10.tgz",
-      "integrity": "sha512-I6LPUvlRH+O6VRUqYOcMudhaIdUVWfsjnZavnsraHvpBwaEyMN29ry+0UVJhImYL16xsscu0aske3yA+uPOWfw==",
+      "version": "22.13.9",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.9.tgz",
+      "integrity": "sha512-acBjXdRJ3A6Pb3tqnw9HZmyR3Fiol3aGxRCK1x3d+6CDAMjl7I649wpSd+yNURCjbOUGu9tqtLKnTGxmK6CyGw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -1962,9 +1946,9 @@
      "integrity": "sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ=="
    },
    "node_modules/@types/ws": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.0.tgz",
-      "integrity": "sha512-8svvI3hMyvN0kKCJMvTJP/x6Y/EoQbepff882wL+Sn5QsXb3etnamgrJq4isrBxSJj5L2AuXcI0+bgkoAXGUJw==",
+      "version": "8.5.14",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
+      "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -2870,12 +2854,14 @@
      }
    },
    "node_modules/detect-libc": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
-      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
-      "license": "Apache-2.0",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
      "engines": {
-        "node": ">=8"
+        "node": ">=0.10"
      }
    },
    "node_modules/devlop": {
@@ -2923,9 +2909,9 @@
      }
    },
    "node_modules/esbuild": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.1.tgz",
-      "integrity": "sha512-BGO5LtrGC7vxnqucAe/rmvKdJllfGaYWdyABvyMoXQlfYMb2bbRuReWR5tEGE//4LcNJj9XrkovTqNYRFZHAMQ==",
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.0.tgz",
+      "integrity": "sha512-BXq5mqc8ltbaN34cDqWuYKyNhX8D/Z0J1xdtdQ8UcIIIyJyz+ZMKUt58tF3SrZ85jcfN/PZYhjR5uDQAYNVbuw==",
      "hasInstallScript": true,
      "license": "MIT",
      "bin": {
@@ -2935,31 +2921,31 @@
        "node": ">=18"
      },
      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.1",
-        "@esbuild/android-arm": "0.25.1",
-        "@esbuild/android-arm64": "0.25.1",
-        "@esbuild/android-x64": "0.25.1",
-        "@esbuild/darwin-arm64": "0.25.1",
-        "@esbuild/darwin-x64": "0.25.1",
-        "@esbuild/freebsd-arm64": "0.25.1",
-        "@esbuild/freebsd-x64": "0.25.1",
-        "@esbuild/linux-arm": "0.25.1",
-        "@esbuild/linux-arm64": "0.25.1",
-        "@esbuild/linux-ia32": "0.25.1",
-        "@esbuild/linux-loong64": "0.25.1",
-        "@esbuild/linux-mips64el": "0.25.1",
-        "@esbuild/linux-ppc64": "0.25.1",
-        "@esbuild/linux-riscv64": "0.25.1",
-        "@esbuild/linux-s390x": "0.25.1",
-        "@esbuild/linux-x64": "0.25.1",
-        "@esbuild/netbsd-arm64": "0.25.1",
-        "@esbuild/netbsd-x64": "0.25.1",
-        "@esbuild/openbsd-arm64": "0.25.1",
-        "@esbuild/openbsd-x64": "0.25.1",
-        "@esbuild/sunos-x64": "0.25.1",
-        "@esbuild/win32-arm64": "0.25.1",
-        "@esbuild/win32-ia32": "0.25.1",
-        "@esbuild/win32-x64": "0.25.1"
+        "@esbuild/aix-ppc64": "0.25.0",
+        "@esbuild/android-arm": "0.25.0",
+        "@esbuild/android-arm64": "0.25.0",
+        "@esbuild/android-x64": "0.25.0",
+        "@esbuild/darwin-arm64": "0.25.0",
+        "@esbuild/darwin-x64": "0.25.0",
+        "@esbuild/freebsd-arm64": "0.25.0",
+        "@esbuild/freebsd-x64": "0.25.0",
+        "@esbuild/linux-arm": "0.25.0",
+        "@esbuild/linux-arm64": "0.25.0",
+        "@esbuild/linux-ia32": "0.25.0",
+        "@esbuild/linux-loong64": "0.25.0",
+        "@esbuild/linux-mips64el": "0.25.0",
+        "@esbuild/linux-ppc64": "0.25.0",
+        "@esbuild/linux-riscv64": "0.25.0",
+        "@esbuild/linux-s390x": "0.25.0",
+        "@esbuild/linux-x64": "0.25.0",
+        "@esbuild/netbsd-arm64": "0.25.0",
+        "@esbuild/netbsd-x64": "0.25.0",
+        "@esbuild/openbsd-arm64": "0.25.0",
+        "@esbuild/openbsd-x64": "0.25.0",
+        "@esbuild/sunos-x64": "0.25.0",
+        "@esbuild/win32-arm64": "0.25.0",
+        "@esbuild/win32-ia32": "0.25.0",
+        "@esbuild/win32-x64": "0.25.0"
      }
    },
    "node_modules/esbuild-sass-plugin": {
@@ -2976,6 +2962,22 @@
        "sass-embedded": "^1.71.1"
      }
    },
+    "node_modules/esbuild/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.0.tgz",
+      "integrity": "sha512-21sUNbq2r84YE+SJDfaQRvdgznTD8Xc0oc3p3iW/a1EVWeNj/SdUCbm5U0itZPQYRuRTW20fPMWMpcrciH2EJw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
    "node_modules/escalade": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
@@ -3549,9 +3551,9 @@
      }
    },
    "node_modules/hast-util-to-jsx-runtime": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.6.tgz",
-      "integrity": "sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/hast-util-to-jsx-runtime/-/hast-util-to-jsx-runtime-2.3.5.tgz",
+      "integrity": "sha512-gHD+HoFxOMmmXLuq9f2dZDMQHVcplCVpMfBNRpJsF03yyLZvJGzsFORe8orVuYDX9k2w0VH0uF8oryFd1whqKQ==",
      "license": "MIT",
      "dependencies": {
        "@types/estree": "^1.0.0",
@@ -3566,7 +3568,7 @@
        "mdast-util-mdxjs-esm": "^2.0.0",
        "property-information": "^7.0.0",
        "space-separated-tokens": "^2.0.0",
-        "style-to-js": "^1.0.0",
+        "style-to-object": "^1.0.0",
        "unist-util-position": "^5.0.0",
        "vfile-message": "^4.0.0"
      },
@@ -3771,10 +3773,9 @@
      "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw=="
    },
    "node_modules/inline-style-parser": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.4.tgz",
-      "integrity": "sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q==",
-      "license": "MIT"
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.2.2.tgz",
+      "integrity": "sha512-EcKzdTHVe8wFVOGEYXiW9WmJXPjqi1T+234YpJr98RiFYKHV3cdy1+3mkTE+KHTHxFFLH51SfaGOoUdW+v7ViQ=="
    },
    "node_modules/internmap": {
      "version": "2.0.3",
@@ -3987,12 +3988,11 @@
      }
    },
    "node_modules/lightningcss": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.2.tgz",
-      "integrity": "sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==",
-      "license": "MPL-2.0",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.1.tgz",
+      "integrity": "sha512-FmGoeD4S05ewj+AkhTY+D+myDvXI6eL27FjHIjoyUkO/uw7WZD1fBVs0QxeYWa7E17CUHJaYX/RUGISCtcrG4Q==",
      "dependencies": {
-        "detect-libc": "^2.0.3"
+        "detect-libc": "^1.0.3"
      },
      "engines": {
        "node": ">= 12.0.0"
@@ -4002,26 +4002,25 @@
        "url": "https://opencollective.com/parcel"
      },
      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.29.2",
-        "lightningcss-darwin-x64": "1.29.2",
-        "lightningcss-freebsd-x64": "1.29.2",
-        "lightningcss-linux-arm-gnueabihf": "1.29.2",
-        "lightningcss-linux-arm64-gnu": "1.29.2",
-        "lightningcss-linux-arm64-musl": "1.29.2",
-        "lightningcss-linux-x64-gnu": "1.29.2",
-        "lightningcss-linux-x64-musl": "1.29.2",
-        "lightningcss-win32-arm64-msvc": "1.29.2",
-        "lightningcss-win32-x64-msvc": "1.29.2"
+        "lightningcss-darwin-arm64": "1.29.1",
+        "lightningcss-darwin-x64": "1.29.1",
+        "lightningcss-freebsd-x64": "1.29.1",
+        "lightningcss-linux-arm-gnueabihf": "1.29.1",
+        "lightningcss-linux-arm64-gnu": "1.29.1",
+        "lightningcss-linux-arm64-musl": "1.29.1",
+        "lightningcss-linux-x64-gnu": "1.29.1",
+        "lightningcss-linux-x64-musl": "1.29.1",
+        "lightningcss-win32-arm64-msvc": "1.29.1",
+        "lightningcss-win32-x64-msvc": "1.29.1"
      }
    },
    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.2.tgz",
-      "integrity": "sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.1.tgz",
+      "integrity": "sha512-HtR5XJ5A0lvCqYAoSv2QdZZyoHNttBpa5EP9aNuzBQeKGfbyH5+UipLWvVzpP4Uml5ej4BYs5I9Lco9u1fECqw==",
      "cpu": [
        "arm64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "darwin"
@@ -4035,13 +4034,12 @@
      }
    },
    "node_modules/lightningcss-darwin-x64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.2.tgz",
-      "integrity": "sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.1.tgz",
+      "integrity": "sha512-k33G9IzKUpHy/J/3+9MCO4e+PzaFblsgBjSGlpAaFikeBFm8B/CkO3cKU9oI4g+fjS2KlkLM/Bza9K/aw8wsNA==",
      "cpu": [
        "x64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "darwin"
@@ -4055,13 +4053,12 @@
      }
    },
    "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.2.tgz",
-      "integrity": "sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.1.tgz",
+      "integrity": "sha512-0SUW22fv/8kln2LnIdOCmSuXnxgxVC276W5KLTwoehiO0hxkacBxjHOL5EtHD8BAXg2BvuhsJPmVMasvby3LiQ==",
      "cpu": [
        "x64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "freebsd"
@@ -4075,13 +4072,12 @@
      }
    },
    "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.2.tgz",
-      "integrity": "sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.1.tgz",
+      "integrity": "sha512-sD32pFvlR0kDlqsOZmYqH/68SqUMPNj+0pucGxToXZi4XZgZmqeX/NkxNKCPsswAXU3UeYgDSpGhu05eAufjDg==",
      "cpu": [
        "arm"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "linux"
@@ -4095,13 +4091,12 @@
      }
    },
    "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.2.tgz",
-      "integrity": "sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.1.tgz",
+      "integrity": "sha512-0+vClRIZ6mmJl/dxGuRsE197o1HDEeeRk6nzycSy2GofC2JsY4ifCRnvUWf/CUBQmlrvMzt6SMQNMSEu22csWQ==",
      "cpu": [
        "arm64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "linux"
@@ -4115,13 +4110,12 @@
      }
    },
    "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.2.tgz",
-      "integrity": "sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.1.tgz",
+      "integrity": "sha512-UKMFrG4rL/uHNgelBsDwJcBqVpzNJbzsKkbI3Ja5fg00sgQnHw/VrzUTEc4jhZ+AN2BvQYz/tkHu4vt1kLuJyw==",
      "cpu": [
        "arm64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "linux"
@@ -4135,13 +4129,12 @@
      }
    },
    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.2.tgz",
-      "integrity": "sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.1.tgz",
+      "integrity": "sha512-u1S+xdODy/eEtjADqirA774y3jLcm8RPtYztwReEXoZKdzgsHYPl0s5V52Tst+GKzqjebkULT86XMSxejzfISw==",
      "cpu": [
        "x64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "linux"
@@ -4155,13 +4148,12 @@
      }
    },
    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.2.tgz",
-      "integrity": "sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.1.tgz",
+      "integrity": "sha512-L0Tx0DtaNUTzXv0lbGCLB/c/qEADanHbu4QdcNOXLIe1i8i22rZRpbT3gpWYsCh9aSL9zFujY/WmEXIatWvXbw==",
      "cpu": [
        "x64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "linux"
@@ -4175,13 +4167,12 @@
      }
    },
    "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.2.tgz",
-      "integrity": "sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.1.tgz",
+      "integrity": "sha512-QoOVnkIEFfbW4xPi+dpdft/zAKmgLgsRHfJalEPYuJDOWf7cLQzYg0DEh8/sn737FaeMJxHZRc1oBreiwZCjog==",
      "cpu": [
        "arm64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "win32"
@@ -4195,13 +4186,12 @@
      }
    },
    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.2.tgz",
-      "integrity": "sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==",
+      "version": "1.29.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.1.tgz",
+      "integrity": "sha512-NygcbThNBe4JElP+olyTI/doBNGJvLs3bFCRPdvuCcxZCcCZ71B858IHpdm7L1btZex0FvCmM17FK98Y9MRy1Q==",
      "cpu": [
        "x64"
      ],
-      "license": "MPL-2.0",
      "optional": true,
      "os": [
        "win32"
@@ -6616,6 +6606,15 @@
        "@img/sharp-win32-x64": "0.33.5"
      }
    },
+    "node_modules/sharp/node_modules/detect-libc": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
+      "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/shebang-command": {
      "version": "2.0.0",
      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -6861,22 +6860,12 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/style-to-js": {
-      "version": "1.1.16",
-      "resolved": "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.16.tgz",
-      "integrity": "sha512-/Q6ld50hKYPH3d/r6nr117TZkHR0w0kGGIVfpG9N6D8NymRPM9RqCUv4pRpJ62E5DqOYx2AFpbZMyCPnjQCnOw==",
-      "license": "MIT",
-      "dependencies": {
-        "style-to-object": "1.0.8"
-      }
-    },
    "node_modules/style-to-object": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.8.tgz",
-      "integrity": "sha512-xT47I/Eo0rwJmaXC4oilDGDWLohVhR6o/xAQcPQN8q6QBuZVL8qMYL85kLmST5cPjAorwvqIA4qXTRQoYHaL6g==",
-      "license": "MIT",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-1.0.5.tgz",
+      "integrity": "sha512-rDRwHtoDD3UMMrmZ6BzOW0naTjMsVZLIjsGleSKS/0Oz+cgCfAPRspaqJuE8rDzpKha/nEvnM0IF4seEAZUTKQ==",
      "dependencies": {
-        "inline-style-parser": "0.2.4"
+        "inline-style-parser": "0.2.2"
      }
    },
    "node_modules/supports-color": {
--- a/package.json
+++ b/package.json
@@ -51,11 +51,11 @@
    "globby": "^14.1.0",
    "gray-matter": "^4.0.3",
    "hast-util-to-html": "^9.0.5",
-    "hast-util-to-jsx-runtime": "^2.3.6",
+    "hast-util-to-jsx-runtime": "^2.3.5",
    "hast-util-to-string": "^3.0.1",
    "is-absolute-url": "^4.0.1",
    "js-yaml": "^4.1.0",
-    "lightningcss": "^1.29.2",
+    "lightningcss": "^1.29.1",
    "mdast-util-find-and-replace": "^3.0.2",
    "mdast-util-to-hast": "^13.2.0",
    "mdast-util-to-string": "^4.0.0",
@@ -102,12 +102,12 @@
    "@types/d3": "^7.4.3",
    "@types/hast": "^3.0.4",
    "@types/js-yaml": "^4.0.9",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.9",
    "@types/pretty-time": "^1.1.5",
    "@types/source-map-support": "^0.5.10",
-    "@types/ws": "^8.18.0",
+    "@types/ws": "^8.5.14",
    "@types/yargs": "^17.0.33",
-    "esbuild": "^0.25.1",
+    "esbuild": "^0.25.0",
    "prettier": "^3.5.3",
    "tsx": "^4.19.3",
    "typescript": "^5.8.2"
--- a/quartz.config.ts
+++ b/quartz.config.ts
@@ -19,6 +19,7 @@ const config: QuartzConfig = {
    baseUrl: "quartz.jzhao.xyz",
    ignorePatterns: ["private", "templates", ".obsidian"],
    defaultDateType: "created",
+    generateSocialImages: true,
    theme: {
      fontOrigin: "googleFonts",
      cdnCaching: true,
--- a/quartz.layout.ts
+++ b/quartz.layout.ts
@@ -25,15 +25,8 @@ export const defaultContentPageLayout: PageLayout = {
  left: [
    Component.PageTitle(),
    Component.MobileOnly(Component.Spacer()),
-    Component.Flex({
-      components: [
-        {
-          Component: Component.Search(),
-          grow: true,
-        },
-        { Component: Component.Darkmode() },
-      ],
-    }),
+    Component.Search(),
+    Component.Darkmode(),
    Component.Explorer(),
  ],
  right: [
--- a/quartz/build.ts
+++ b/quartz/build.ts
@@ -19,7 +19,6 @@ import { options } from "./util/sourcemap"
 import { Mutex } from "async-mutex"
 import DepGraph from "./depgraph"
 import { getStaticResourcesFromPlugins } from "./plugins"
-import { randomIdNonSecure } from "./util/random"

 type Dependencies = Record<string, DepGraph<FilePath> | null>

@@ -39,9 +38,13 @@ type BuildData = {

 type FileEvent = "add" | "change" | "delete"

+function newBuildId() {
+  return Math.random().toString(36).substring(2, 8)
+}
+
 async function buildQuartz(argv: Argv, mut: Mutex, clientRefresh: () => void) {
  const ctx: BuildCtx = {
-    buildId: randomIdNonSecure(),
+    buildId: newBuildId(),
    argv,
    cfg,
    allSlugs: [],
@@ -159,7 +162,7 @@ async function partialRebuildFromEntrypoint(
    return
  }

-  const buildId = randomIdNonSecure()
+  const buildId = newBuildId()
  ctx.buildId = buildId
  buildData.lastBuildMs = new Date().getTime()
  const release = await mut.acquire()
@@ -356,7 +359,7 @@ async function rebuildFromEntrypoint(
    toRemove.add(filePath)
  }

-  const buildId = randomIdNonSecure()
+  const buildId = newBuildId()
  ctx.buildId = buildId
  buildData.lastBuildMs = new Date().getTime()
  const release = await mut.acquire()
--- a/quartz/cfg.ts
+++ b/quartz/cfg.ts
@@ -61,6 +61,10 @@ export interface GlobalConfiguration {
   *   Quartz will avoid using this as much as possible and use relative URLs most of the time
   */
  baseUrl?: string
+  /**
+   * Whether to generate social images (Open Graph and Twitter standard) for link previews
+   */
+  generateSocialImages: boolean | Partial<SocialImageOptions>
  theme: Theme
  /**
   * Allow to translate the date in the language of your choice.
--- a/quartz/components/Backlinks.tsx
+++ b/quartz/components/Backlinks.tsx
@@ -3,7 +3,7 @@ import style from "./styles/backlinks.scss"
 import { resolveRelative, simplifySlug } from "../util/path"
 import { i18n } from "../i18n"
 import { classNames } from "../util/lang"
-import OverflowListFactory from "./OverflowList"
+import OverflowList from "./OverflowList"

 interface BacklinksOptions {
  hideWhenEmpty: boolean
@@ -15,7 +15,6 @@ const defaultOptions: BacklinksOptions = {

 export default ((opts?: Partial<BacklinksOptions>) => {
  const options: BacklinksOptions = { ...defaultOptions, ...opts }
-  const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()

  const Backlinks: QuartzComponent = ({
    fileData,
@@ -31,7 +30,7 @@ export default ((opts?: Partial<BacklinksOptions>) => {
    return (
      <div class={classNames(displayClass, "backlinks")}>
        <h3>{i18n(cfg.locale).components.backlinks.title}</h3>
-        <OverflowList>
+        <OverflowList id="backlinks-ul">
          {backlinkFiles.length > 0 ? (
            backlinkFiles.map((f) => (
              <li>
@@ -49,7 +48,7 @@ export default ((opts?: Partial<BacklinksOptions>) => {
  }

  Backlinks.css = style
-  Backlinks.afterDOMLoaded = overflowListAfterDOMLoaded
+  Backlinks.afterDOMLoaded = OverflowList.afterDOMLoaded("backlinks-ul")

  return Backlinks
 }) satisfies QuartzComponentConstructor
--- a/quartz/components/Breadcrumbs.tsx
+++ b/quartz/components/Breadcrumbs.tsx
@@ -102,7 +102,7 @@ export default ((opts?: Partial<BreadcrumbOptions>) => {

        // Add current slug to full path
        currentPath = joinSegments(currentPath, slugParts[i])
-        const includeTrailingSlash = !isTagPath || i < slugParts.length - 1
+        const includeTrailingSlash = !isTagPath || i < 1

        // Format and add current crumb
        const crumb = formatCrumb(
--- a/quartz/components/Darkmode.tsx
+++ b/quartz/components/Darkmode.tsx
@@ -1,4 +1,6 @@
-// @ts-ignore
+// @ts-ignore: this is safe, we don't want to actually make darkmode.inline.ts a module as
+// modules are automatically deferred and we don't want that to happen for critical beforeDOMLoads
+// see: https://v8.dev/features/modules#defer
 import darkmodeScript from "./scripts/darkmode.inline"
 import styles from "./styles/darkmode.scss"
 import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
@@ -7,12 +9,12 @@ import { classNames } from "../util/lang"

 const Darkmode: QuartzComponent = ({ displayClass, cfg }: QuartzComponentProps) => {
  return (
-    <button class={classNames(displayClass, "darkmode")}>
+    <button class={classNames(displayClass, "darkmode")} id="darkmode">
      <svg
        xmlns="http://www.w3.org/2000/svg"
        xmlnsXlink="http://www.w3.org/1999/xlink"
        version="1.1"
-        class="dayIcon"
+        id="dayIcon"
        x="0px"
        y="0px"
        viewBox="0 0 35 35"
@@ -27,7 +29,7 @@ const Darkmode: QuartzComponent = ({ displayClass, cfg }: QuartzComponentProps)
        xmlns="http://www.w3.org/2000/svg"
        xmlnsXlink="http://www.w3.org/1999/xlink"
        version="1.1"
-        class="nightIcon"
+        id="nightIcon"
        x="0px"
        y="0px"
        viewBox="0 0 100 100"
--- a/quartz/components/DesktopOnly.tsx
+++ b/quartz/components/DesktopOnly.tsx
@@ -1,6 +1,7 @@
 import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"

-export default ((component: QuartzComponent) => {
+export default ((component?: QuartzComponent) => {
+  if (component) {
    const Component = component
    const DesktopOnly: QuartzComponent = (props: QuartzComponentProps) => {
      return <Component displayClass="desktop-only" {...props} />
@@ -11,4 +12,7 @@ export default ((component: QuartzComponent) => {
    DesktopOnly.beforeDOMLoaded = component?.beforeDOMLoaded
    DesktopOnly.css = component?.css
    return DesktopOnly
-}) satisfies QuartzComponentConstructor<QuartzComponent>
+  } else {
+    return () => <></>
+  }
+}) satisfies QuartzComponentConstructor
--- a/quartz/components/Explorer.tsx
+++ b/quartz/components/Explorer.tsx
@@ -6,8 +6,7 @@ import script from "./scripts/explorer.inline"
 import { classNames } from "../util/lang"
 import { i18n } from "../i18n"
 import { FileTrieNode } from "../util/fileTrie"
-import OverflowListFactory from "./OverflowList"
-import { concatenateResources } from "../util/resources"
+import OverflowList from "./OverflowList"

 type OrderEntries = "sort" | "filter" | "map"

@@ -24,7 +23,7 @@ export interface Options {

 const defaultOptions: Options = {
  folderDefaultState: "collapsed",
-  folderClickBehavior: "link",
+  folderClickBehavior: "collapse",
  useSavedState: true,
  mapFn: (node) => {
    return node
@@ -57,7 +56,6 @@ export type FolderState = {

 export default ((userOpts?: Partial<Options>) => {
  const opts: Options = { ...defaultOptions, ...userOpts }
-  const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()

  const Explorer: QuartzComponent = ({ cfg, displayClass }: QuartzComponentProps) => {
    return (
@@ -75,7 +73,8 @@ export default ((userOpts?: Partial<Options>) => {
      >
        <button
          type="button"
-          class="explorer-toggle mobile-explorer hide-until-loaded"
+          id="mobile-explorer"
+          class="explorer-toggle hide-until-loaded"
          data-mobile={true}
          aria-controls="explorer-content"
        >
@@ -96,7 +95,8 @@ export default ((userOpts?: Partial<Options>) => {
        </button>
        <button
          type="button"
-          class="title-button explorer-toggle desktop-explorer"
+          id="desktop-explorer"
+          class="title-button explorer-toggle"
          data-mobile={false}
          aria-expanded={true}
        >
@@ -116,8 +116,8 @@ export default ((userOpts?: Partial<Options>) => {
            <polyline points="6 9 12 15 18 9"></polyline>
          </svg>
        </button>
-        <div class="explorer-content" aria-expanded={false}>
-          <OverflowList class="explorer-ul" />
+        <div id="explorer-content" aria-expanded={false}>
+          <OverflowList id="explorer-ul" />
        </div>
        <template id="template-file">
          <li>
@@ -157,6 +157,6 @@ export default ((userOpts?: Partial<Options>) => {
  }

  Explorer.css = style
-  Explorer.afterDOMLoaded = concatenateResources(script, overflowListAfterDOMLoaded)
+  Explorer.afterDOMLoaded = script + OverflowList.afterDOMLoaded("explorer-ul")
  return Explorer
 }) satisfies QuartzComponentConstructor
--- a/quartz/components/Flex.tsx
+++ b/quartz/components/Flex.tsx
@@ -1,55 +0,0 @@
-import { concatenateResources } from "../util/resources"
-import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
-
-type FlexConfig = {
-  components: {
-    Component: QuartzComponent
-    grow?: boolean
-    shrink?: boolean
-    basis?: string
-    order?: number
-    align?: "start" | "end" | "center" | "stretch"
-    justify?: "start" | "end" | "center" | "between" | "around"
-  }[]
-  direction?: "row" | "row-reverse" | "column" | "column-reverse"
-  wrap?: "nowrap" | "wrap" | "wrap-reverse"
-  gap?: string
-}
-
-export default ((config: FlexConfig) => {
-  const Flex: QuartzComponent = (props: QuartzComponentProps) => {
-    const direction = config.direction ?? "row"
-    const wrap = config.wrap ?? "nowrap"
-    const gap = config.gap ?? "1rem"
-
-    return (
-      <div style={`display: flex; flex-direction: ${direction}; flex-wrap: ${wrap}; gap: ${gap};`}>
-        {config.components.map((c) => {
-          const grow = c.grow ? 1 : 0
-          const shrink = (c.shrink ?? true) ? 1 : 0
-          const basis = c.basis ?? "auto"
-          const order = c.order ?? 0
-          const align = c.align ?? "center"
-          const justify = c.justify ?? "center"
-
-          return (
-            <div
-              style={`flex-grow: ${grow}; flex-shrink: ${shrink}; flex-basis: ${basis}; order: ${order}; align-self: ${align}; justify-self: ${justify};`}
-            >
-              <c.Component {...props} />
-            </div>
-          )
-        })}
-      </div>
-    )
-  }
-
-  Flex.afterDOMLoaded = concatenateResources(
-    ...config.components.map((c) => c.Component.afterDOMLoaded),
-  )
-  Flex.beforeDOMLoaded = concatenateResources(
-    ...config.components.map((c) => c.Component.beforeDOMLoaded),
-  )
-  Flex.css = concatenateResources(...config.components.map((c) => c.Component.css))
-  return Flex
-}) satisfies QuartzComponentConstructor<FlexConfig>
--- a/quartz/components/Graph.tsx
+++ b/quartz/components/Graph.tsx
@@ -48,7 +48,7 @@ const defaultOptions: GraphOptions = {
    depth: -1,
    scale: 0.9,
    repelForce: 0.5,
-    centerForce: 0.2,
+    centerForce: 0.3,
    linkDistance: 30,
    fontSize: 0.6,
    opacityScale: 1,
@@ -67,8 +67,8 @@ export default ((opts?: Partial<GraphOptions>) => {
      <div class={classNames(displayClass, "graph")}>
        <h3>{i18n(cfg.locale).components.graph.title}</h3>
        <div class="graph-outer">
-          <div class="graph-container" data-cfg={JSON.stringify(localGraph)}></div>
-          <button class="global-graph-icon" aria-label="Global Graph">
+          <div id="graph-container" data-cfg={JSON.stringify(localGraph)}></div>
+          <button id="global-graph-icon" aria-label="Global Graph">
            <svg
              version="1.1"
              xmlns="http://www.w3.org/2000/svg"
@@ -95,8 +95,8 @@ export default ((opts?: Partial<GraphOptions>) => {
            </svg>
          </button>
        </div>
-        <div class="global-graph-outer">
-          <div class="global-graph-container" data-cfg={JSON.stringify(globalGraph)}></div>
+        <div id="global-graph-outer">
+          <div id="global-graph-container" data-cfg={JSON.stringify(globalGraph)}></div>
        </div>
      </div>
    )
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,41 +1,173 @@
 import { i18n } from "../i18n"
-import { FullSlug, getFileExtension, joinSegments, pathToRoot } from "../util/path"
+import { FullSlug, joinSegments, pathToRoot } from "../util/path"
 import { CSSResourceToStyleElement, JSResourceToScriptElement } from "../util/resources"
-import { googleFontHref } from "../util/theme"
+import { getFontSpecificationName, googleFontHref } from "../util/theme"
 import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
+import satori, { SatoriOptions } from "satori"
+import { loadEmoji, getIconCode } from "../util/emoji"
+import fs from "fs"
+import sharp from "sharp"
+import { ImageOptions, SocialImageOptions, getSatoriFont, defaultImage } from "../util/og"
 import { unescapeHTML } from "../util/escape"
-import { CustomOgImagesEmitterName } from "../plugins/emitters/ogImage"
+
+/**
+ * Generates social image (OG/twitter standard) and saves it as `.webp` inside the public folder
+ * @param opts options for generating image
+ */
+async function generateSocialImage(
+  { cfg, description, fileName, fontsPromise, title, fileData }: ImageOptions,
+  userOpts: SocialImageOptions,
+  imageDir: string,
+) {
+  const fonts = await fontsPromise
+  const { width, height } = userOpts
+
+  // JSX that will be used to generate satori svg
+  const imageComponent = userOpts.imageStructure(cfg, userOpts, title, description, fonts, fileData)
+
+  const svg = await satori(imageComponent, {
+    width,
+    height,
+    fonts,
+    loadAdditionalAsset: async (languageCode: string, segment: string) => {
+      if (languageCode === "emoji") {
+        return `data:image/svg+xml;base64,${btoa(await loadEmoji(getIconCode(segment)))}`
+      }
+
+      return languageCode
+    },
+  })
+
+  // Convert svg directly to webp (with additional compression)
+  const compressed = await sharp(Buffer.from(svg)).webp({ quality: 40 }).toBuffer()
+
+  // Write to file system
+  const filePath = joinSegments(imageDir, `${fileName}.${extension}`)
+  fs.writeFileSync(filePath, compressed)
+}
+
+const extension = "webp"
+
+const defaultOptions: SocialImageOptions = {
+  colorScheme: "lightMode",
+  width: 1200,
+  height: 630,
+  imageStructure: defaultImage,
+  excludeRoot: false,
+}
+
 export default (() => {
+  let fontsPromise: Promise<SatoriOptions["fonts"]>
+
+  let fullOptions: SocialImageOptions
  const Head: QuartzComponent = ({
    cfg,
    fileData,
    externalResources,
    ctx,
  }: QuartzComponentProps) => {
+    // Initialize options if not set
+    if (!fullOptions) {
+      if (typeof cfg.generateSocialImages !== "boolean") {
+        fullOptions = { ...defaultOptions, ...cfg.generateSocialImages }
+      } else {
+        fullOptions = defaultOptions
+      }
+    }
+
+    // Memoize google fonts
+    if (!fontsPromise && cfg.generateSocialImages) {
+      const headerFont = getFontSpecificationName(cfg.theme.typography.header)
+      const bodyFont = getFontSpecificationName(cfg.theme.typography.body)
+      fontsPromise = getSatoriFont(headerFont, bodyFont)
+    }
+
+    const slug = fileData.filePath
+    // since "/" is not a valid character in file names, replace with "-"
+    const fileName = slug?.replaceAll("/", "-")
+
+    // Get file description (priority: frontmatter > fileData > default)
+    const fdDescription =
+      fileData.description?.trim() ?? i18n(cfg.locale).propertyDefaults.description
    const titleSuffix = cfg.pageTitleSuffix ?? ""
    const title =
      (fileData.frontmatter?.title ?? i18n(cfg.locale).propertyDefaults.title) + titleSuffix
-    const description =
-      fileData.frontmatter?.socialDescription ??
-      fileData.frontmatter?.description ??
-      unescapeHTML(fileData.description?.trim() ?? i18n(cfg.locale).propertyDefaults.description)
+    let description = ""
+    if (fdDescription) {
+      description = unescapeHTML(fdDescription)
+    }
+
+    if (fileData.frontmatter?.socialDescription) {
+      description = fileData.frontmatter?.socialDescription as string
+    } else if (fileData.frontmatter?.description) {
+      description = fileData.frontmatter?.description
+    }
+
+    const fileDir = joinSegments(ctx.argv.output, "static", "social-images")
+    if (cfg.generateSocialImages) {
+      // Generate folders for social images (if they dont exist yet)
+      if (!fs.existsSync(fileDir)) {
+        fs.mkdirSync(fileDir, { recursive: true })
+      }
+
+      if (fileName) {
+        // Generate social image (happens async)
+        void generateSocialImage(
+          {
+            title,
+            description,
+            fileName,
+            fileDir,
+            fileExt: extension,
+            fontsPromise,
+            cfg,
+            fileData,
+          },
+          fullOptions,
+          fileDir,
+        )
+      }
+    }

    const { css, js, additionalHead } = externalResources

    const url = new URL(`https://${cfg.baseUrl ?? "example.com"}`)
    const path = url.pathname as FullSlug
    const baseDir = fileData.slug === "404" ? path : pathToRoot(fileData.slug!)
+
    const iconPath = joinSegments(baseDir, "static/icon.png")

+    const ogImageDefaultPath = `https://${cfg.baseUrl}/static/og-image.png`
+    // "static/social-images/slug-filename.md.webp"
+    const ogImageGeneratedPath = `https://${cfg.baseUrl}/${fileDir.replace(
+      `${ctx.argv.output}/`,
+      "",
+    )}/${fileName}.${extension}`
+
+    // Use default og image if filePath doesnt exist (for autogenerated paths with no .md file)
+    const useDefaultOgImage = fileName === undefined || !cfg.generateSocialImages
+
+    // Path to og/social image (priority: frontmatter > generated image (if enabled) > default image)
+    let ogImagePath = useDefaultOgImage ? ogImageDefaultPath : ogImageGeneratedPath
+
+    // TODO: could be improved to support external images in the future
+    // Aliases for image and cover handled in `frontmatter.ts`
+    const frontmatterImgUrl = fileData.frontmatter?.socialImage
+
+    // Override with default og image if config option is set
+    if (fileData.slug === "index") {
+      ogImagePath = ogImageDefaultPath
+    }
+
+    // Override with frontmatter url if existing
+    if (frontmatterImgUrl) {
+      ogImagePath = `https://${cfg.baseUrl}/static/${frontmatterImgUrl}`
+    }
+
    // Url of current page
    const socialUrl =
      fileData.slug === "404" ? url.toString() : joinSegments(url.toString(), fileData.slug!)

-    const usesCustomOgImage = ctx.cfg.plugins.emitters.some(
-      (e) => e.name === CustomOgImagesEmitterName,
-    )
-    const ogImageDefaultPath = `https://${cfg.baseUrl}/static/og-image.png`
-
    return (
      <head>
        <title>{title}</title>
@@ -49,7 +181,7 @@ export default (() => {
        )}
        <link rel="preconnect" href="https://cdnjs.cloudflare.com" crossOrigin="anonymous" />
        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
+        {/* OG/Twitter meta tags */}
        <meta name="og:site_name" content={cfg.pageTitle}></meta>
        <meta property="og:title" content={title} />
        <meta property="og:type" content="website" />
@@ -57,32 +189,28 @@ export default (() => {
        <meta name="twitter:title" content={title} />
        <meta name="twitter:description" content={description} />
        <meta property="og:description" content={description} />
+        <meta property="og:image:type" content={`image/${extension}`} />
        <meta property="og:image:alt" content={description} />
-
-        {!usesCustomOgImage && (
+        {/* Dont set width and height if unknown (when using custom frontmatter image) */}
+        {!frontmatterImgUrl && (
          <>
-            <meta property="og:image" content={ogImageDefaultPath} />
-            <meta property="og:image:url" content={ogImageDefaultPath} />
-            <meta name="twitter:image" content={ogImageDefaultPath} />
-            <meta
-              property="og:image:type"
-              content={`image/${getFileExtension(ogImageDefaultPath) ?? "png"}`}
-            />
+            <meta property="og:image:width" content={fullOptions.width.toString()} />
+            <meta property="og:image:height" content={fullOptions.height.toString()} />
          </>
        )}
-
+        <meta property="og:image:url" content={ogImagePath} />
        {cfg.baseUrl && (
          <>
+            <meta name="twitter:image" content={ogImagePath} />
+            <meta property="og:image" content={ogImagePath} />
            <meta property="twitter:domain" content={cfg.baseUrl}></meta>
            <meta property="og:url" content={socialUrl}></meta>
            <meta property="twitter:url" content={socialUrl}></meta>
          </>
        )}
-
        <link rel="icon" href={iconPath} />
        <meta name="description" content={description} />
        <meta name="generator" content="Quartz" />
-
        {css.map((resource) => CSSResourceToStyleElement(resource, true))}
        {js
          .filter((resource) => resource.loadTime === "beforeDOMReady")
--- a/quartz/components/MobileOnly.tsx
+++ b/quartz/components/MobileOnly.tsx
@@ -1,6 +1,7 @@
 import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"

-export default ((component: QuartzComponent) => {
+export default ((component?: QuartzComponent) => {
+  if (component) {
    const Component = component
    const MobileOnly: QuartzComponent = (props: QuartzComponentProps) => {
      return <Component displayClass="mobile-only" {...props} />
@@ -11,4 +12,7 @@ export default ((component: QuartzComponent) => {
    MobileOnly.beforeDOMLoaded = component?.beforeDOMLoaded
    MobileOnly.css = component?.css
    return MobileOnly
-}) satisfies QuartzComponentConstructor<QuartzComponent>
+  } else {
+    return () => <></>
+  }
+}) satisfies QuartzComponentConstructor
--- a/quartz/components/OverflowList.tsx
+++ b/quartz/components/OverflowList.tsx
@@ -1,31 +1,22 @@
 import { JSX } from "preact"
-import { randomIdNonSecure } from "../util/random"

 const OverflowList = ({
  children,
  ...props
 }: JSX.HTMLAttributes<HTMLUListElement> & { id: string }) => {
  return (
-    <ul {...props} class={[props.class, "overflow"].filter(Boolean).join(" ")} id={props.id}>
+    <ul class="overflow" {...props}>
      {children}
      <li class="overflow-end" />
    </ul>
  )
 }

-export default () => {
-  const id = randomIdNonSecure()
-
-  return {
-    OverflowList: (props: JSX.HTMLAttributes<HTMLUListElement>) => (
-      <OverflowList {...props} id={id} />
-    ),
-    overflowListAfterDOMLoaded: `
+OverflowList.afterDOMLoaded = (id: string) => `
 document.addEventListener("nav", (e) => {
  const observer = new IntersectionObserver((entries) => {
    for (const entry of entries) {
      const parentUl = entry.target.parentElement
-      if (!parentUl) return
      if (entry.isIntersecting) {
        parentUl.classList.remove("gradient-active")
      } else {
@@ -43,6 +34,6 @@ document.addEventListener("nav", (e) => {
  observer.observe(end)
  window.addCleanup(() => observer.disconnect())
 })
-`,
-  }
-}
+`
+
+export default OverflowList
--- a/quartz/components/Search.tsx
+++ b/quartz/components/Search.tsx
@@ -19,7 +19,7 @@ export default ((userOpts?: Partial<SearchOptions>) => {
    const searchPlaceholder = i18n(cfg.locale).components.search.searchBarPlaceholder
    return (
      <div class={classNames(displayClass, "search")}>
-        <button class="search-button">
+        <button class="search-button" id="search-button">
          <p>{i18n(cfg.locale).components.search.title}</p>
          <svg role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 19.9 19.7">
            <title>Search</title>
@@ -29,17 +29,17 @@ export default ((userOpts?: Partial<SearchOptions>) => {
            </g>
          </svg>
        </button>
-        <div class="search-container">
-          <div class="search-space">
+        <div id="search-container">
+          <div id="search-space">
            <input
              autocomplete="off"
-              class="search-bar"
+              id="search-bar"
              name="search"
              type="text"
              aria-label={searchPlaceholder}
              placeholder={searchPlaceholder}
            />
-            <div class="search-layout" data-preview={opts.enablePreview}></div>
+            <div id="search-layout" data-preview={opts.enablePreview}></div>
          </div>
        </div>
      </div>
--- a/quartz/components/TableOfContents.tsx
+++ b/quartz/components/TableOfContents.tsx
@@ -6,8 +6,7 @@ import { classNames } from "../util/lang"
 // @ts-ignore
 import script from "./scripts/toc.inline"
 import { i18n } from "../i18n"
-import OverflowListFactory from "./OverflowList"
-import { concatenateResources } from "../util/resources"
+import OverflowList from "./OverflowList"

 interface Options {
  layout: "modern" | "legacy"
@@ -17,14 +16,11 @@ const defaultOptions: Options = {
  layout: "modern",
 }

-export default ((opts?: Partial<Options>) => {
-  const layout = opts?.layout ?? defaultOptions.layout
-  const { OverflowList, overflowListAfterDOMLoaded } = OverflowListFactory()
-  const TableOfContents: QuartzComponent = ({
+const TableOfContents: QuartzComponent = ({
  fileData,
  displayClass,
  cfg,
-  }: QuartzComponentProps) => {
+}: QuartzComponentProps) => {
  if (!fileData.toc) {
    return null
  }
@@ -33,7 +29,8 @@ export default ((opts?: Partial<Options>) => {
    <div class={classNames(displayClass, "toc")}>
      <button
        type="button"
-          class={fileData.collapseToc ? "collapsed toc-header" : "toc-header"}
+        id="toc"
+        class={fileData.collapseToc ? "collapsed" : ""}
        aria-controls="toc-content"
        aria-expanded={!fileData.collapseToc}
      >
@@ -53,8 +50,8 @@ export default ((opts?: Partial<Options>) => {
          <polyline points="6 9 12 15 18 9"></polyline>
        </svg>
      </button>
-        <div class={fileData.collapseToc ? "collapsed toc-content" : "toc-content"}>
-          <OverflowList>
+      <div id="toc-content" class={fileData.collapseToc ? "collapsed" : ""}>
+        <OverflowList id="toc-ul">
          {fileData.toc.map((tocEntry) => (
            <li key={tocEntry.slug} class={`depth-${tocEntry.depth}`}>
              <a href={`#${tocEntry.slug}`} data-for={tocEntry.slug}>
@@ -66,17 +63,16 @@ export default ((opts?: Partial<Options>) => {
      </div>
    </div>
  )
-  }
+}
+TableOfContents.css = modernStyle
+TableOfContents.afterDOMLoaded = script + OverflowList.afterDOMLoaded("toc-ul")

-  TableOfContents.css = modernStyle
-  TableOfContents.afterDOMLoaded = concatenateResources(script, overflowListAfterDOMLoaded)
-
-  const LegacyTableOfContents: QuartzComponent = ({ fileData, cfg }: QuartzComponentProps) => {
+const LegacyTableOfContents: QuartzComponent = ({ fileData, cfg }: QuartzComponentProps) => {
  if (!fileData.toc) {
    return null
  }
  return (
-      <details class="toc" open={!fileData.collapseToc}>
+    <details id="toc" open={!fileData.collapseToc}>
      <summary>
        <h3>{i18n(cfg.locale).components.tableOfContents.title}</h3>
      </summary>
@@ -91,8 +87,10 @@ export default ((opts?: Partial<Options>) => {
      </ul>
    </details>
  )
-  }
-  LegacyTableOfContents.css = legacyStyle
+}
+LegacyTableOfContents.css = legacyStyle

+export default ((opts?: Partial<Options>) => {
+  const layout = opts?.layout ?? defaultOptions.layout
  return layout === "modern" ? TableOfContents : LegacyTableOfContents
 }) satisfies QuartzComponentConstructor
--- a/quartz/components/index.ts
+++ b/quartz/components/index.ts
@@ -20,7 +20,6 @@ import MobileOnly from "./MobileOnly"
 import RecentNotes from "./RecentNotes"
 import Breadcrumbs from "./Breadcrumbs"
 import Comments from "./Comments"
-import Flex from "./Flex"

 export {
  ArticleTitle,
@@ -45,5 +44,4 @@ export {
  NotFound,
  Breadcrumbs,
  Comments,
-  Flex,
 }
--- a/quartz/components/pages/FolderContent.tsx
+++ b/quartz/components/pages/FolderContent.tsx
@@ -9,7 +9,6 @@ import { htmlToJsx } from "../../util/jsx"
 import { i18n } from "../../i18n"
 import { QuartzPluginData } from "../../plugins/vfile"
 import { ComponentChildren } from "preact"
-import { concatenateResources } from "../../util/resources"

 interface FolderContentOptions {
  /**
@@ -105,6 +104,6 @@ export default ((opts?: Partial<FolderContentOptions>) => {
    )
  }

-  FolderContent.css = concatenateResources(style, PageList.css)
+  FolderContent.css = style + PageList.css
  return FolderContent
 }) satisfies QuartzComponentConstructor
--- a/quartz/components/pages/TagContent.tsx
+++ b/quartz/components/pages/TagContent.tsx
@@ -7,7 +7,6 @@ import { Root } from "hast"
 import { htmlToJsx } from "../../util/jsx"
 import { i18n } from "../../i18n"
 import { ComponentChildren } from "preact"
-import { concatenateResources } from "../../util/resources"

 interface TagContentOptions {
  sort?: SortFn
@@ -125,6 +124,6 @@ export default ((opts?: Partial<TagContentOptions>) => {
    }
  }

-  TagContent.css = concatenateResources(style, PageList.css)
+  TagContent.css = style + PageList.css
  return TagContent
 }) satisfies QuartzComponentConstructor
--- a/quartz/components/renderPage.tsx
+++ b/quartz/components/renderPage.tsx
@@ -9,6 +9,9 @@ import { visit } from "unist-util-visit"
 import { Root, Element, ElementContent } from "hast"
 import { GlobalConfiguration } from "../cfg"
 import { i18n } from "../i18n"
+// @ts-ignore
+import mermaidScript from "./scripts/mermaid.inline"
+import mermaidStyle from "./styles/mermaid.inline.scss"
 import { QuartzPluginData } from "../plugins/vfile"

 interface RenderComponents {
@@ -55,6 +58,17 @@ export function pageResources(
    additionalHead: staticResources.additionalHead,
  }

+  if (fileData.hasMermaidDiagram) {
+    resources.js.push({
+      script: mermaidScript,
+      loadTime: "afterDOMReady",
+      moduleType: "module",
+      contentType: "inline",
+    })
+    resources.css.push({ content: mermaidStyle, inline: true })
+  }
+
+  // NOTE: we have to put this last to make sure spa.inline.ts is the last item.
  resources.js.push({
    src: joinSegments(baseDir, "postscript.js"),
    loadTime: "afterDOMReady",
--- a/quartz/components/scripts/callout.inline.ts
+++ b/quartz/components/scripts/callout.inline.ts
@@ -28,8 +28,8 @@ function setupCallout() {
  ) as HTMLCollectionOf<HTMLElement>
  for (const div of collapsible) {
    const title = div.firstElementChild
-    if (!title) continue

+    if (title) {
      title.addEventListener("click", toggleCallout)
      window.addCleanup(() => title.removeEventListener("click", toggleCallout))

@@ -37,6 +37,8 @@ function setupCallout() {
      const height = collapsed ? title.scrollHeight : div.scrollHeight
      div.style.maxHeight = height + "px"
    }
+  }
 }

 document.addEventListener("nav", setupCallout)
+window.addEventListener("resize", setupCallout)
--- a/quartz/components/scripts/darkmode.inline.ts
+++ b/quartz/components/scripts/darkmode.inline.ts
@@ -25,11 +25,12 @@ document.addEventListener("nav", () => {
    emitThemeChangeEvent(newTheme)
  }

-  for (const darkmodeButton of document.getElementsByClassName("darkmode")) {
-    darkmodeButton.addEventListener("click", switchTheme)
-    window.addCleanup(() => darkmodeButton.removeEventListener("click", switchTheme))
+  // Darkmode toggle
+  const themeButton = document.querySelector("#darkmode") as HTMLButtonElement
+  if (themeButton) {
+    themeButton.addEventListener("click", switchTheme)
+    window.addCleanup(() => themeButton.removeEventListener("click", switchTheme))
  }
-
  // Listen for changes in prefers-color-scheme
  const colorSchemeMediaQuery = window.matchMedia("(prefers-color-scheme: dark)")
  colorSchemeMediaQuery.addEventListener("change", themeChange)
--- a/quartz/components/scripts/explorer.inline.ts
+++ b/quartz/components/scripts/explorer.inline.ts
@@ -21,13 +21,14 @@ type FolderState = {

 let currentExplorerState: Array<FolderState>
 function toggleExplorer(this: HTMLElement) {
-  const nearestExplorer = this.closest(".explorer") as HTMLElement
-  if (!nearestExplorer) return
-  nearestExplorer.classList.toggle("collapsed")
-  nearestExplorer.setAttribute(
+  const explorers = document.querySelectorAll(".explorer")
+  for (const explorer of explorers) {
+    explorer.classList.toggle("collapsed")
+    explorer.setAttribute(
      "aria-expanded",
-    nearestExplorer.getAttribute("aria-expanded") === "true" ? "false" : "true",
+      explorer.getAttribute("aria-expanded") === "true" ? "false" : "true",
    )
+  }
 }

 function toggleFolder(evt: MouseEvent) {
@@ -77,11 +78,11 @@ function createFileNode(currentSlug: FullSlug, node: FileTrieNode): HTMLLIElemen
  const clone = template.content.cloneNode(true) as DocumentFragment
  const li = clone.querySelector("li") as HTMLLIElement
  const a = li.querySelector("a") as HTMLAnchorElement
-  a.href = resolveRelative(currentSlug, node.slug)
-  a.dataset.for = node.slug
+  a.href = resolveRelative(currentSlug, node.data?.slug!)
+  a.dataset.for = node.data?.slug
  a.textContent = node.displayName

-  if (currentSlug === node.slug) {
+  if (currentSlug === node.data?.slug) {
    a.classList.add("active")
  }

@@ -101,7 +102,7 @@ function createFolderNode(
  const folderOuter = li.querySelector(".folder-outer") as HTMLElement
  const ul = folderOuter.querySelector("ul") as HTMLUListElement

-  const folderPath = node.slug
+  const folderPath = node.data?.slug!
  folderContainer.dataset.folderpath = folderPath

  if (opts.folderClickBehavior === "link") {
@@ -109,7 +110,7 @@ function createFolderNode(
    const button = titleContainer.querySelector(".folder-button") as HTMLElement
    const a = document.createElement("a")
    a.href = resolveRelative(currentSlug, folderPath)
-    a.dataset.for = folderPath
+    a.dataset.for = node.data?.slug
    a.className = "folder-title"
    a.textContent = node.displayName
    button.replaceWith(a)
@@ -144,7 +145,7 @@ function createFolderNode(
 }

 async function setupExplorer(currentSlug: FullSlug) {
-  const allExplorers = document.querySelectorAll("div.explorer") as NodeListOf<HTMLElement>
+  const allExplorers = document.querySelectorAll(".explorer") as NodeListOf<HTMLElement>

  for (const explorer of allExplorers) {
    const dataFns = JSON.parse(explorer.dataset.dataFns || "{}")
@@ -191,7 +192,7 @@ async function setupExplorer(currentSlug: FullSlug) {
      collapsed: oldIndex.get(path) === true,
    }))

-    const explorerUl = explorer.querySelector(".explorer-ul")
+    const explorerUl = document.getElementById("explorer-ul")
    if (!explorerUl) continue

    // Create and insert new content
@@ -218,12 +219,14 @@ async function setupExplorer(currentSlug: FullSlug) {
    }

    // Set up event handlers
-    const explorerButtons = explorer.getElementsByClassName(
-      "explorer-toggle",
-    ) as HTMLCollectionOf<HTMLElement>
-    for (const button of explorerButtons) {
-      button.addEventListener("click", toggleExplorer)
-      window.addCleanup(() => button.removeEventListener("click", toggleExplorer))
+    const explorerButtons = explorer.querySelectorAll(
+      "button.explorer-toggle",
+    ) as NodeListOf<HTMLElement>
+    if (explorerButtons) {
+      window.addCleanup(() =>
+        explorerButtons.forEach((button) => button.removeEventListener("click", toggleExplorer)),
+      )
+      explorerButtons.forEach((button) => button.addEventListener("click", toggleExplorer))
    }

    // Set up folder click handlers
@@ -232,8 +235,8 @@ async function setupExplorer(currentSlug: FullSlug) {
        "folder-button",
      ) as HTMLCollectionOf<HTMLElement>
      for (const button of folderButtons) {
-        button.addEventListener("click", toggleFolder)
        window.addCleanup(() => button.removeEventListener("click", toggleFolder))
+        button.addEventListener("click", toggleFolder)
      }
    }

@@ -241,15 +244,15 @@ async function setupExplorer(currentSlug: FullSlug) {
      "folder-icon",
    ) as HTMLCollectionOf<HTMLElement>
    for (const icon of folderIcons) {
-      icon.addEventListener("click", toggleFolder)
      window.addCleanup(() => icon.removeEventListener("click", toggleFolder))
+      icon.addEventListener("click", toggleFolder)
    }
  }
 }

-document.addEventListener("prenav", async () => {
+document.addEventListener("prenav", async (e: CustomEventMap["prenav"]) => {
  // save explorer scrollTop position
-  const explorer = document.querySelector(".explorer-ul")
+  const explorer = document.getElementById("explorer-ul")
  if (!explorer) return
  sessionStorage.setItem("explorerScrollTop", explorer.scrollTop.toString())
 })
@@ -259,8 +262,9 @@ document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
  await setupExplorer(currentSlug)

  // if mobile hamburger is visible, collapse by default
-  for (const explorer of document.getElementsByClassName("mobile-explorer")) {
-    if (explorer.checkVisibility()) {
+  const mobileExplorer = document.getElementById("mobile-explorer")
+  if (mobileExplorer && mobileExplorer.checkVisibility()) {
+    for (const explorer of document.querySelectorAll(".explorer")) {
      explorer.classList.add("collapsed")
      explorer.setAttribute("aria-expanded", "false")
    }
--- a/quartz/components/scripts/graph.inline.ts
+++ b/quartz/components/scripts/graph.inline.ts
@@ -68,9 +68,11 @@ type TweenNode = {
  stop: () => void
 }

-async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
+async function renderGraph(container: string, fullSlug: FullSlug) {
  const slug = simplifySlug(fullSlug)
  const visited = getVisited()
+  const graph = document.getElementById(container)
+  if (!graph) return
  removeAllChildren(graph)

  let {
@@ -165,14 +167,16 @@ async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
  const height = Math.max(graph.offsetHeight, 250)

  // we virtualize the simulation and use pixi to actually render it
+  // Calculate the radius of the container circle
+  const radius = Math.min(width, height) / 2 - 40 // 40px padding
  const simulation: Simulation<NodeData, LinkData> = forceSimulation<NodeData>(graphData.nodes)
    .force("charge", forceManyBody().strength(-100 * repelForce))
    .force("center", forceCenter().strength(centerForce))
    .force("link", forceLink(graphData.links).distance(linkDistance))
    .force("collide", forceCollide<NodeData>((n) => nodeRadius(n)).iterations(3))

-  const radius = (Math.min(width, height) / 2) * 0.8
-  if (enableRadial) simulation.force("radial", forceRadial(radius).strength(0.2))
+  if (enableRadial)
+    simulation.force("radial", forceRadial(radius * 0.8, width / 2, height / 2).strength(0.3))

  // precompute style prop strings as pixi doesn't support css variables
  const cssVars = [
@@ -520,9 +524,7 @@ async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
    )
  }

-  let stopAnimation = false
  function animate(time: number) {
-    if (stopAnimation) return
    for (const n of nodeRenderData) {
      const { x, y } = n.simulationData
      if (!x || !y) continue
@@ -546,101 +548,61 @@ async function renderGraph(graph: HTMLElement, fullSlug: FullSlug) {
    requestAnimationFrame(animate)
  }

-  requestAnimationFrame(animate)
-  return () => {
-    stopAnimation = true
-    app.destroy()
-  }
-}
-
-let localGraphCleanups: (() => void)[] = []
-let globalGraphCleanups: (() => void)[] = []
-
-function cleanupLocalGraphs() {
-  for (const cleanup of localGraphCleanups) {
-    cleanup()
-  }
-  localGraphCleanups = []
-}
-
-function cleanupGlobalGraphs() {
-  for (const cleanup of globalGraphCleanups) {
-    cleanup()
-  }
-  globalGraphCleanups = []
+  const graphAnimationFrameHandle = requestAnimationFrame(animate)
+  window.addCleanup(() => cancelAnimationFrame(graphAnimationFrameHandle))
 }

 document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
  const slug = e.detail.url
  addToVisited(simplifySlug(slug))
+  await renderGraph("graph-container", slug)

-  async function renderLocalGraph() {
-    cleanupLocalGraphs()
-    const localGraphContainers = document.getElementsByClassName("graph-container")
-    for (const container of localGraphContainers) {
-      localGraphCleanups.push(await renderGraph(container as HTMLElement, slug))
-    }
-  }
-
-  await renderLocalGraph()
+  // Function to re-render the graph when the theme changes
  const handleThemeChange = () => {
-    void renderLocalGraph()
+    renderGraph("graph-container", slug)
  }

+  // event listener for theme change
  document.addEventListener("themechange", handleThemeChange)
+
+  // cleanup for the event listener
  window.addCleanup(() => {
    document.removeEventListener("themechange", handleThemeChange)
  })

-  const containers = [...document.getElementsByClassName("global-graph-outer")] as HTMLElement[]
-  async function renderGlobalGraph() {
+  const container = document.getElementById("global-graph-outer")
+  const sidebar = container?.closest(".sidebar") as HTMLElement
+
+  function renderGlobalGraph() {
    const slug = getFullSlug(window)
-    for (const container of containers) {
-      container.classList.add("active")
-      const sidebar = container.closest(".sidebar") as HTMLElement
+    container?.classList.add("active")
    if (sidebar) {
      sidebar.style.zIndex = "1"
    }

-      const graphContainer = container.querySelector(".global-graph-container") as HTMLElement
+    renderGraph("global-graph-container", slug)
    registerEscapeHandler(container, hideGlobalGraph)
-      if (graphContainer) {
-        globalGraphCleanups.push(await renderGraph(graphContainer, slug))
-      }
-    }
  }

  function hideGlobalGraph() {
-    cleanupGlobalGraphs()
-    for (const container of containers) {
-      container.classList.remove("active")
-      const sidebar = container.closest(".sidebar") as HTMLElement
+    container?.classList.remove("active")
    if (sidebar) {
      sidebar.style.zIndex = ""
    }
  }
-  }

  async function shortcutHandler(e: HTMLElementEventMap["keydown"]) {
    if (e.key === "g" && (e.ctrlKey || e.metaKey) && !e.shiftKey) {
      e.preventDefault()
-      const anyGlobalGraphOpen = containers.some((container) =>
-        container.classList.contains("active"),
-      )
-      anyGlobalGraphOpen ? hideGlobalGraph() : renderGlobalGraph()
+      const globalGraphOpen = container?.classList.contains("active")
+      globalGraphOpen ? hideGlobalGraph() : renderGlobalGraph()
    }
  }

-  const containerIcons = document.getElementsByClassName("global-graph-icon")
-  Array.from(containerIcons).forEach((icon) => {
-    icon.addEventListener("click", renderGlobalGraph)
-    window.addCleanup(() => icon.removeEventListener("click", renderGlobalGraph))
-  })
+  const containerIcon = document.getElementById("global-graph-icon")
+  containerIcon?.addEventListener("click", renderGlobalGraph)
+  window.addCleanup(() => containerIcon?.removeEventListener("click", renderGlobalGraph))

  document.addEventListener("keydown", shortcutHandler)
-  window.addCleanup(() => {
-    document.removeEventListener("keydown", shortcutHandler)
-    cleanupLocalGraphs()
-    cleanupGlobalGraphs()
-  })
+  window.addCleanup(() => document.removeEventListener("keydown", shortcutHandler))
 })
--- a/quartz/components/scripts/mermaid.inline.ts
+++ b/quartz/components/scripts/mermaid.inline.ts
@@ -1,4 +1,4 @@
-import { registerEscapeHandler, removeAllChildren } from "./util"
+import { removeAllChildren } from "./util"

 interface Position {
  x: number
@@ -12,8 +12,7 @@ class DiagramPanZoom {
  private scale = 1
  private readonly MIN_SCALE = 0.5
  private readonly MAX_SCALE = 3
-
-  cleanups: (() => void)[] = []
+  private readonly ZOOM_SENSITIVITY = 0.001

  constructor(
    private container: HTMLElement,
@@ -21,33 +20,19 @@ class DiagramPanZoom {
  ) {
    this.setupEventListeners()
    this.setupNavigationControls()
-    this.resetTransform()
  }

  private setupEventListeners() {
    // Mouse drag events
-    const mouseDownHandler = this.onMouseDown.bind(this)
-    const mouseMoveHandler = this.onMouseMove.bind(this)
-    const mouseUpHandler = this.onMouseUp.bind(this)
-    const resizeHandler = this.resetTransform.bind(this)
+    this.container.addEventListener("mousedown", this.onMouseDown.bind(this))
+    document.addEventListener("mousemove", this.onMouseMove.bind(this))
+    document.addEventListener("mouseup", this.onMouseUp.bind(this))

-    this.container.addEventListener("mousedown", mouseDownHandler)
-    document.addEventListener("mousemove", mouseMoveHandler)
-    document.addEventListener("mouseup", mouseUpHandler)
-    window.addEventListener("resize", resizeHandler)
+    // Wheel zoom events
+    this.container.addEventListener("wheel", this.onWheel.bind(this), { passive: false })

-    this.cleanups.push(
-      () => this.container.removeEventListener("mousedown", mouseDownHandler),
-      () => document.removeEventListener("mousemove", mouseMoveHandler),
-      () => document.removeEventListener("mouseup", mouseUpHandler),
-      () => window.removeEventListener("resize", resizeHandler),
-    )
-  }
-
-  cleanup() {
-    for (const cleanup of this.cleanups) {
-      cleanup()
-    }
+    // Reset on window resize
+    window.addEventListener("resize", this.resetTransform.bind(this))
  }

  private setupNavigationControls() {
@@ -99,6 +84,26 @@ class DiagramPanZoom {
    this.container.style.cursor = "grab"
  }

+  private onWheel(e: WheelEvent) {
+    e.preventDefault()
+
+    const delta = -e.deltaY * this.ZOOM_SENSITIVITY
+    const newScale = Math.min(Math.max(this.scale + delta, this.MIN_SCALE), this.MAX_SCALE)
+
+    // Calculate mouse position relative to content
+    const rect = this.content.getBoundingClientRect()
+    const mouseX = e.clientX - rect.left
+    const mouseY = e.clientY - rect.top
+
+    // Adjust pan to zoom around mouse position
+    const scaleDiff = newScale - this.scale
+    this.currentPan.x -= mouseX * scaleDiff
+    this.currentPan.y -= mouseY * scaleDiff
+
+    this.scale = newScale
+    this.updateTransform()
+  }
+
  private zoom(delta: number) {
    const newScale = Math.min(Math.max(this.scale + delta, this.MIN_SCALE), this.MAX_SCALE)

@@ -121,11 +126,7 @@ class DiagramPanZoom {

  private resetTransform() {
    this.scale = 1
-    const svg = this.content.querySelector("svg")!
-    this.currentPan = {
-      x: svg.getBoundingClientRect().width / 2,
-      y: svg.getBoundingClientRect().height / 2,
-    }
+    this.currentPan = { x: 0, y: 0 }
    this.updateTransform()
  }
 }
@@ -148,35 +149,20 @@ document.addEventListener("nav", async () => {
  const nodes = center.querySelectorAll("code.mermaid") as NodeListOf<HTMLElement>
  if (nodes.length === 0) return

-  mermaidImport ||= await import(
-    // @ts-ignore
-    "https://cdnjs.cloudflare.com/ajax/libs/mermaid/11.4.0/mermaid.esm.min.mjs"
-  )
-  const mermaid = mermaidImport.default
-
-  const textMapping: WeakMap<HTMLElement, string> = new WeakMap()
-  for (const node of nodes) {
-    textMapping.set(node, node.innerText)
-  }
-
-  async function renderMermaid() {
-    // de-init any other diagrams
-    for (const node of nodes) {
-      node.removeAttribute("data-processed")
-      const oldText = textMapping.get(node)
-      if (oldText) {
-        node.innerHTML = oldText
-      }
-    }
-
  const computedStyleMap = cssVars.reduce(
    (acc, key) => {
-        acc[key] = window.getComputedStyle(document.documentElement).getPropertyValue(key)
+      acc[key] = getComputedStyle(document.documentElement).getPropertyValue(key)
      return acc
    },
    {} as Record<(typeof cssVars)[number], string>,
  )

+  mermaidImport ||= await import(
+    //@ts-ignore
+    "https://cdnjs.cloudflare.com/ajax/libs/mermaid/11.4.0/mermaid.esm.min.mjs"
+  )
+  const mermaid = mermaidImport.default
+
  const darkMode = document.documentElement.getAttribute("saved-theme") === "dark"
  mermaid.initialize({
    startOnLoad: false,
@@ -194,13 +180,7 @@ document.addEventListener("nav", async () => {
      edgeLabelBackground: computedStyleMap["--highlight"],
    },
  })
-
  await mermaid.run({ nodes })
-  }
-
-  await renderMermaid()
-  document.addEventListener("themechange", renderMermaid)
-  window.addCleanup(() => document.removeEventListener("themechange", renderMermaid))

  for (let i = 0; i < nodes.length; i++) {
    const codeBlock = nodes[i] as HTMLElement
@@ -223,6 +203,7 @@ document.addEventListener("nav", async () => {
    if (!popupContainer) return

    let panZoom: DiagramPanZoom | null = null
+
    function showMermaid() {
      const container = popupContainer.querySelector("#mermaid-space") as HTMLElement
      const content = popupContainer.querySelector(".mermaid-content") as HTMLElement
@@ -243,16 +224,25 @@ document.addEventListener("nav", async () => {

    function hideMermaid() {
      popupContainer.classList.remove("active")
-      panZoom?.cleanup()
      panZoom = null
    }

+    function handleEscape(e: any) {
+      if (e.key === "Escape") {
+        hideMermaid()
+      }
+    }
+
+    const closeBtn = popupContainer.querySelector(".close-button") as HTMLButtonElement
+
+    closeBtn.addEventListener("click", hideMermaid)
    expandBtn.addEventListener("click", showMermaid)
-    registerEscapeHandler(popupContainer, hideMermaid)
+    document.addEventListener("keydown", handleEscape)

    window.addCleanup(() => {
-      panZoom?.cleanup()
+      closeBtn.removeEventListener("click", hideMermaid)
      expandBtn.removeEventListener("click", showMermaid)
+      document.removeEventListener("keydown", handleEscape)
    })
  }
 })
--- a/quartz/components/scripts/popover.inline.ts
+++ b/quartz/components/scripts/popover.inline.ts
@@ -82,8 +82,6 @@ async function mouseEnterHandler(
      const contents = await response.text()
      const html = p.parseFromString(contents, "text/html")
      normalizeRelativeURLs(html, targetUrl)
-      // strip all IDs from elements to prevent duplicates
-      html.querySelectorAll("[id]").forEach((el) => el.removeAttribute("id"))
      const elts = [...html.getElementsByClassName("popover-hint")]
      if (elts.length === 0) return

--- a/quartz/components/scripts/search.inline.ts
+++ b/quartz/components/scripts/search.inline.ts
@@ -143,75 +143,83 @@ function highlightHTML(searchTerm: string, el: HTMLElement) {
  return html.body
 }

-async function setupSearch(searchElement: Element, currentSlug: FullSlug, data: ContentIndex) {
-  const container = searchElement.querySelector(".search-container") as HTMLElement
-  if (!container) return
-
-  const sidebar = container.closest(".sidebar") as HTMLElement
-  if (!sidebar) return
-
-  const searchButton = searchElement.querySelector(".search-button") as HTMLButtonElement
-  if (!searchButton) return
-
-  const searchBar = searchElement.querySelector(".search-bar") as HTMLInputElement
-  if (!searchBar) return
-
-  const searchLayout = searchElement.querySelector(".search-layout") as HTMLElement
-  if (!searchLayout) return
-
+document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
+  const currentSlug = e.detail.url
+  const data = await fetchData
+  const container = document.getElementById("search-container")
+  const sidebar = container?.closest(".sidebar") as HTMLElement
+  const searchButton = document.getElementById("search-button")
+  const searchBar = document.getElementById("search-bar") as HTMLInputElement | null
+  const searchLayout = document.getElementById("search-layout")
  const idDataMap = Object.keys(data) as FullSlug[]
+
  const appendLayout = (el: HTMLElement) => {
-    searchLayout.appendChild(el)
+    if (searchLayout?.querySelector(`#${el.id}`) === null) {
+      searchLayout?.appendChild(el)
+    }
  }

-  const enablePreview = searchLayout.dataset.preview === "true"
+  const enablePreview = searchLayout?.dataset?.preview === "true"
  let preview: HTMLDivElement | undefined = undefined
  let previewInner: HTMLDivElement | undefined = undefined
  const results = document.createElement("div")
-  results.className = "results-container"
+  results.id = "results-container"
  appendLayout(results)

  if (enablePreview) {
    preview = document.createElement("div")
-    preview.className = "preview-container"
+    preview.id = "preview-container"
    appendLayout(preview)
  }

  function hideSearch() {
-    container.classList.remove("active")
+    container?.classList.remove("active")
+    if (searchBar) {
      searchBar.value = "" // clear the input when we dismiss the search
+    }
+    if (sidebar) {
      sidebar.style.zIndex = ""
+    }
+    if (results) {
      removeAllChildren(results)
+    }
    if (preview) {
      removeAllChildren(preview)
    }
+    if (searchLayout) {
      searchLayout.classList.remove("display-results")
+    }
+
    searchType = "basic" // reset search type after closing
-    searchButton.focus()
+
+    searchButton?.focus()
  }

  function showSearch(searchTypeNew: SearchType) {
    searchType = searchTypeNew
+    if (sidebar) {
      sidebar.style.zIndex = "1"
-    container.classList.add("active")
-    searchBar.focus()
+    }
+    container?.classList.add("active")
+    searchBar?.focus()
  }

  let currentHover: HTMLInputElement | null = null
+
  async function shortcutHandler(e: HTMLElementEventMap["keydown"]) {
    if (e.key === "k" && (e.ctrlKey || e.metaKey) && !e.shiftKey) {
      e.preventDefault()
-      const searchBarOpen = container.classList.contains("active")
+      const searchBarOpen = container?.classList.contains("active")
      searchBarOpen ? hideSearch() : showSearch("basic")
      return
    } else if (e.shiftKey && (e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k") {
      // Hotkey to open tag search
      e.preventDefault()
-      const searchBarOpen = container.classList.contains("active")
+      const searchBarOpen = container?.classList.contains("active")
      searchBarOpen ? hideSearch() : showSearch("tags")

      // add "#" prefix for tag search
-      searchBar.value = "#"
+      if (searchBar) searchBar.value = "#"
      return
    }

@@ -220,23 +228,23 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
    }

    // If search is active, then we will render the first result and display accordingly
-    if (!container.classList.contains("active")) return
+    if (!container?.classList.contains("active")) return
    if (e.key === "Enter") {
      // If result has focus, navigate to that one, otherwise pick first result
-      if (results.contains(document.activeElement)) {
+      if (results?.contains(document.activeElement)) {
        const active = document.activeElement as HTMLInputElement
        if (active.classList.contains("no-match")) return
        await displayPreview(active)
        active.click()
      } else {
        const anchor = document.getElementsByClassName("result-card")[0] as HTMLInputElement | null
-        if (!anchor || anchor.classList.contains("no-match")) return
+        if (!anchor || anchor?.classList.contains("no-match")) return
        await displayPreview(anchor)
        anchor.click()
      }
    } else if (e.key === "ArrowUp" || (e.shiftKey && e.key === "Tab")) {
      e.preventDefault()
-      if (results.contains(document.activeElement)) {
+      if (results?.contains(document.activeElement)) {
        // If an element in results-container already has focus, focus previous one
        const currentResult = currentHover
          ? currentHover
@@ -329,6 +337,8 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
  }

  async function displayResults(finalResults: Item[]) {
+    if (!results) return
+
    removeAllChildren(results)
    if (finalResults.length === 0) {
      results.innerHTML = `<a class="result-card no-match">
@@ -384,7 +394,7 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:
    preview.replaceChildren(previewInner)

    // scroll to longest
-    const highlights = [...preview.getElementsByClassName("highlight")].sort(
+    const highlights = [...preview.querySelectorAll(".highlight")].sort(
      (a, b) => b.innerHTML.length - a.innerHTML.length,
    )
    highlights[0]?.scrollIntoView({ block: "start" })
@@ -450,23 +460,21 @@ async function setupSearch(searchElement: Element, currentSlug: FullSlug, data:

  document.addEventListener("keydown", shortcutHandler)
  window.addCleanup(() => document.removeEventListener("keydown", shortcutHandler))
-  searchButton.addEventListener("click", () => showSearch("basic"))
-  window.addCleanup(() => searchButton.removeEventListener("click", () => showSearch("basic")))
-  searchBar.addEventListener("input", onType)
-  window.addCleanup(() => searchBar.removeEventListener("input", onType))
+  searchButton?.addEventListener("click", () => showSearch("basic"))
+  window.addCleanup(() => searchButton?.removeEventListener("click", () => showSearch("basic")))
+  searchBar?.addEventListener("input", onType)
+  window.addCleanup(() => searchBar?.removeEventListener("input", onType))

  registerEscapeHandler(container, hideSearch)
  await fillDocument(data)
-}
+})

 /**
 * Fills flexsearch document with data
 * @param index index to fill
 * @param data data to fill index with
 */
-let indexPopulated = false
-async function fillDocument(data: ContentIndex) {
-  if (indexPopulated) return
+async function fillDocument(data: { [key: FullSlug]: ContentDetails }) {
  let id = 0
  const promises: Array<Promise<unknown>> = []
  for (const [slug, fileData] of Object.entries<ContentDetails>(data)) {
@@ -481,15 +489,5 @@ async function fillDocument(data: ContentIndex) {
    )
  }

-  await Promise.all(promises)
-  indexPopulated = true
+  return await Promise.all(promises)
 }
-
-document.addEventListener("nav", async (e: CustomEventMap["nav"]) => {
-  const currentSlug = e.detail.url
-  const data = await fetchData
-  const searchElement = document.getElementsByClassName("search")
-  for (const element of searchElement) {
-    await setupSearch(element, currentSlug, data)
-  }
-})
--- a/quartz/components/scripts/spa.inline.ts
+++ b/quartz/components/scripts/spa.inline.ts
@@ -56,10 +56,8 @@ function startLoading() {
  }, 100)
 }

-let isNavigating = false
 let p: DOMParser
-async function _navigate(url: URL, isBack: boolean = false) {
-  isNavigating = true
+async function navigate(url: URL, isBack: boolean = false) {
  startLoading()
  p = p || new DOMParser()
  const contents = await fetchCanonical(url)
@@ -130,19 +128,6 @@ async function _navigate(url: URL, isBack: boolean = false) {
  delete announcer.dataset.persist
 }

-async function navigate(url: URL, isBack: boolean = false) {
-  if (isNavigating) return
-  isNavigating = true
-  try {
-    await _navigate(url, isBack)
-  } catch (e) {
-    console.error(e)
-    window.location.assign(url)
-  } finally {
-    isNavigating = false
-  }
-}
-
 window.spaNavigate = navigate

 function createRouter() {
@@ -160,13 +145,21 @@ function createRouter() {
        return
      }

+      try {
        navigate(url, false)
+      } catch (e) {
+        window.location.assign(url)
+      }
    })

    window.addEventListener("popstate", (event) => {
      const { url } = getOpts(event) ?? {}
      if (window.location.hash && window.location.pathname === url?.pathname) return
+      try {
        navigate(new URL(window.location.toString()), true)
+      } catch (e) {
+        window.location.reload()
+      }
      return
    })
  }
--- a/quartz/components/scripts/toc.inline.ts
+++ b/quartz/components/scripts/toc.inline.ts
@@ -25,15 +25,16 @@ function toggleToc(this: HTMLElement) {
 }

 function setupToc() {
-  for (const toc of document.getElementsByClassName("toc")) {
-    const button = toc.querySelector(".toc-header")
-    const content = toc.querySelector(".toc-content")
-    if (!button || !content) return
-    button.addEventListener("click", toggleToc)
-    window.addCleanup(() => button.removeEventListener("click", toggleToc))
+  const toc = document.getElementById("toc")
+  if (toc) {
+    const content = toc.nextElementSibling as HTMLElement | undefined
+    if (!content) return
+    toc.addEventListener("click", toggleToc)
+    window.addCleanup(() => toc.removeEventListener("click", toggleToc))
  }
 }

+window.addEventListener("resize", setupToc)
 document.addEventListener("nav", () => {
  setupToc()

--- a/quartz/components/styles/darkmode.scss
+++ b/quartz/components/styles/darkmode.scss
@@ -29,19 +29,19 @@
 }

 :root[saved-theme="dark"] .darkmode {
-  & > .dayIcon {
+  & > #dayIcon {
    display: none;
  }
-  & > .nightIcon {
+  & > #nightIcon {
    display: inline;
  }
 }

 :root .darkmode {
-  & > .dayIcon {
+  & > #dayIcon {
    display: inline;
  }
-  & > .nightIcon {
+  & > #nightIcon {
    display: none;
  }
 }
--- a/quartz/components/styles/explorer.scss
+++ b/quartz/components/styles/explorer.scss
@@ -20,7 +20,7 @@
      margin: 0;
    }

-    .hide-until-loaded ~ .explorer-content {
+    .hide-until-loaded ~ #explorer-content {
      display: none;
    }
  }
@@ -30,8 +30,6 @@
  display: flex;
  flex-direction: column;
  overflow-y: hidden;
-
-  min-height: 1.2rem;
  flex: 0 1 auto;
  &.collapsed {
    flex: 0 1 1.2rem;
@@ -54,20 +52,20 @@
    align-self: flex-start;
  }

-  button.mobile-explorer {
+  button#mobile-explorer {
    display: none;
  }

-  button.desktop-explorer {
+  button#desktop-explorer {
    display: flex;
  }

  @media all and ($mobile) {
-    button.mobile-explorer {
+    button#mobile-explorer {
      display: flex;
    }

-    button.desktop-explorer {
+    button#desktop-explorer {
      display: none;
    }
  }
@@ -88,8 +86,8 @@
  }
 }

-button.mobile-explorer,
-button.desktop-explorer {
+button#mobile-explorer,
+button#desktop-explorer {
  background-color: transparent;
  border: none;
  text-align: left;
@@ -106,7 +104,7 @@ button.desktop-explorer {
  }
 }

-.explorer-content {
+#explorer-content {
  list-style: none;
  overflow: hidden;
  overflow-y: auto;
@@ -211,7 +209,7 @@ li:has(> .folder-outer:not(.open)) > .folder-container > svg {
    &.collapsed {
      flex: 0 0 34px;

-      & > .explorer-content {
+      & > #explorer-content {
        transform: translateX(-100vw);
        visibility: hidden;
      }
@@ -220,13 +218,13 @@ li:has(> .folder-outer:not(.open)) > .folder-container > svg {
    &:not(.collapsed) {
      flex: 0 0 34px;

-      & > .explorer-content {
+      & > #explorer-content {
        transform: translateX(0);
        visibility: visible;
      }
    }

-    .explorer-content {
+    #explorer-content {
      box-sizing: border-box;
      z-index: 100;
      position: absolute;
@@ -247,7 +245,7 @@ li:has(> .folder-outer:not(.open)) > .folder-container > svg {
      visibility: hidden;
    }

-    .mobile-explorer {
+    #mobile-explorer {
      margin: 0;
      padding: 5px;
      z-index: 101;
--- a/quartz/components/styles/graph.scss
+++ b/quartz/components/styles/graph.scss
@@ -15,7 +15,7 @@
    position: relative;
    overflow: hidden;

-    & > .global-graph-icon {
+    & > #global-graph-icon {
      cursor: pointer;
      background: none;
      border: none;
@@ -38,7 +38,7 @@
    }
  }

-  & > .global-graph-outer {
+  & > #global-graph-outer {
    position: fixed;
    z-index: 9999;
    left: 0;
@@ -53,7 +53,7 @@
      display: inline-block;
    }

-    & > .global-graph-container {
+    & > #global-graph-container {
      border: 1px solid var(--lightgray);
      background-color: var(--light);
      border-radius: 5px;
--- a/quartz/components/styles/legacyToc.scss
+++ b/quartz/components/styles/legacyToc.scss
@@ -1,4 +1,4 @@
-details.toc {
+details#toc {
  & summary {
    cursor: pointer;

--- a/quartz/components/styles/mermaid.inline.scss
+++ b/quartz/components/styles/mermaid.inline.scss
@@ -53,16 +53,46 @@ pre {
  }

  & > #mermaid-space {
-    border: 1px solid var(--lightgray);
-    background-color: var(--light);
-    border-radius: 5px;
-    position: fixed;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    height: 80vh;
-    width: 80vw;
+    display: grid;
+    width: 90%;
+    height: 90vh;
+    margin: 5vh auto;
+    background: var(--light);
+    box-shadow:
+      0 14px 50px rgba(27, 33, 48, 0.12),
+      0 10px 30px rgba(27, 33, 48, 0.16);
    overflow: hidden;
+    position: relative;
+
+    & > .mermaid-header {
+      display: flex;
+      justify-content: flex-end;
+      padding: 1rem;
+      border-bottom: 1px solid var(--lightgray);
+      background: var(--light);
+      z-index: 2;
+      max-height: fit-content;
+
+      & > .close-button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 32px;
+        height: 32px;
+        padding: 0;
+        background: transparent;
+        border: none;
+        border-radius: 4px;
+        color: var(--darkgray);
+        cursor: pointer;
+        transition: all 0.2s ease;
+
+        &:hover {
+          background: var(--lightgray);
+          color: var(--dark);
+        }
+      }
+    }

    & > .mermaid-content {
      padding: 2rem;
--- a/quartz/components/styles/search.scss
+++ b/quartz/components/styles/search.scss
@@ -42,7 +42,7 @@
    }
  }

-  & > .search-container {
+  & > #search-container {
    position: fixed;
    contain: layout;
    z-index: 999;
@@ -58,7 +58,7 @@
      display: inline-block;
    }

-    & > .search-space {
+    & > #search-space {
      width: 65%;
      margin-top: 12vh;
      margin-left: auto;
@@ -91,7 +91,7 @@
        }
      }

-      & > .search-layout {
+      & > #search-layout {
        display: none;
        flex-direction: row;
        border: 1px solid var(--lightgray);
@@ -102,7 +102,7 @@
          display: flex;
        }

-        &[data-preview] > .results-container {
+        &[data-preview] > #results-container {
          flex: 0 0 min(30%, 450px);
        }

@@ -150,7 +150,7 @@
          scroll-margin-top: 2rem;
        }

-        & > .preview-container {
+        & > #preview-container {
          flex-grow: 1;
          display: block;
          overflow: hidden;
@@ -171,7 +171,7 @@
          }
        }

-        & > .results-container {
+        & > #results-container {
          overflow-y: auto;

          & .result-card {
--- a/quartz/components/styles/toc.scss
+++ b/quartz/components/styles/toc.scss
@@ -5,20 +5,19 @@
  flex-direction: column;

  overflow-y: hidden;
-  min-height: 4rem;
  flex: 0 1 auto;
-  &:has(button.toc-header.collapsed) {
+  &:has(button#toc.collapsed) {
    flex: 0 1 1.2rem;
  }
 }

@media all and not ($mobile) {
-  .toc-header {
+  .toc {
    display: flex;
  }
 }

-button.toc-header {
+button#toc {
  background-color: transparent;
  border: none;
  text-align: left;
@@ -45,7 +44,7 @@ button.toc-header {
  }
 }

-.toc-content {
+#toc-content {
  list-style: none;
  position: relative;

--- a/quartz/components/types.ts
+++ b/quartz/components/types.ts
@@ -1,5 +1,5 @@
 import { ComponentType, JSX } from "preact"
-import { StaticResources, StringResource } from "../util/resources"
+import { StaticResources } from "../util/resources"
 import { QuartzPluginData } from "../plugins/vfile"
 import { GlobalConfiguration } from "../cfg"
 import { Node } from "hast"
@@ -19,9 +19,9 @@ export type QuartzComponentProps = {
  }

 export type QuartzComponent = ComponentType<QuartzComponentProps> & {
-  css?: StringResource
-  beforeDOMLoaded?: StringResource
-  afterDOMLoaded?: StringResource
+  css?: string
+  beforeDOMLoaded?: string
+  afterDOMLoaded?: string
 }

 export type QuartzComponentConstructor<Options extends object | undefined = undefined> = (
--- a/quartz/plugins/emitters/404.tsx
+++ b/quartz/plugins/emitters/404.tsx
@@ -31,7 +31,7 @@ export const NotFoundPage: QuartzEmitterPlugin = () => {
    async getDependencyGraph(_ctx, _content, _resources) {
      return new DepGraph<FilePath>()
    },
-    async *emit(ctx, _content, resources) {
+    async emit(ctx, _content, resources): Promise<FilePath[]> {
      const cfg = ctx.cfg.configuration
      const slug = "404" as FullSlug

@@ -55,12 +55,14 @@ export const NotFoundPage: QuartzEmitterPlugin = () => {
        allFiles: [],
      }

-      yield write({
+      return [
+        await write({
          ctx,
          content: renderPage(cfg, slug, componentData, opts, externalResources),
          slug,
          ext: ".html",
-      })
+        }),
+      ]
    },
  }
 }
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -18,13 +18,15 @@ export const AliasRedirects: QuartzEmitterPlugin = () => ({

    return graph
  },
-  async *emit(ctx, content, _resources) {
+  async emit(ctx, content, _resources): Promise<FilePath[]> {
+    const fps: FilePath[] = []
+
    for (const [_tree, file] of content) {
      const ogSlug = simplifySlug(file.data.slug!)

      for (const slug of file.data.aliases ?? []) {
        const redirUrl = resolveRelative(slug, file.data.slug!)
-        yield write({
+        const fp = await write({
          ctx,
          content: `
            <!DOCTYPE html>
@@ -41,7 +43,10 @@ export const AliasRedirects: QuartzEmitterPlugin = () => ({
          slug,
          ext: ".html",
        })
+
+        fps.push(fp)
      }
    }
+    return fps
  },
 })
--- a/quartz/plugins/emitters/assets.ts
+++ b/quartz/plugins/emitters/assets.ts
@@ -33,9 +33,10 @@ export const Assets: QuartzEmitterPlugin = () => {

      return graph
    },
-    async *emit({ argv, cfg }, _content, _resources) {
+    async emit({ argv, cfg }, _content, _resources): Promise<FilePath[]> {
      const assetsPath = argv.output
      const fps = await filesToCopy(argv, cfg)
+      const res: FilePath[] = []
      for (const fp of fps) {
        const ext = path.extname(fp)
        const src = joinSegments(argv.directory, fp) as FilePath
@@ -45,8 +46,10 @@ export const Assets: QuartzEmitterPlugin = () => {
        const dir = path.dirname(dest) as FilePath
        await fs.promises.mkdir(dir, { recursive: true }) // ensure dir exists
        await fs.promises.copyFile(src, dest)
-        yield dest
+        res.push(dest)
      }
+
+      return res
    },
  }
 }
--- a/quartz/plugins/emitters/cname.ts
+++ b/quartz/plugins/emitters/cname.ts
@@ -14,7 +14,7 @@ export const CNAME: QuartzEmitterPlugin = () => ({
  async getDependencyGraph(_ctx, _content, _resources) {
    return new DepGraph<FilePath>()
  },
-  async emit({ argv, cfg }, _content, _resources) {
+  async emit({ argv, cfg }, _content, _resources): Promise<FilePath[]> {
    if (!cfg.configuration.baseUrl) {
      console.warn(chalk.yellow("CNAME emitter requires `baseUrl` to be set in your configuration"))
      return []
@@ -24,7 +24,7 @@ export const CNAME: QuartzEmitterPlugin = () => ({
    if (!content) {
      return []
    }
-    await fs.promises.writeFile(path, content)
+    fs.writeFileSync(path, content)
    return [path] as FilePath[]
  },
 })
--- a/quartz/plugins/emitters/componentResources.ts
+++ b/quartz/plugins/emitters/componentResources.ts
@@ -9,7 +9,7 @@ import styles from "../../styles/custom.scss"
 import popoverStyle from "../../components/styles/popover.scss"
 import { BuildCtx } from "../../util/ctx"
 import { QuartzComponent } from "../../components/types"
-import { googleFontHref, joinStyles, processGoogleFonts } from "../../util/theme"
+import { googleFontHref, joinStyles } from "../../util/theme"
 import { Features, transform } from "lightningcss"
 import { transform as transpile } from "esbuild"
 import { write } from "./helpers"
@@ -36,21 +36,17 @@ function getComponentResources(ctx: BuildCtx): ComponentResources {
    afterDOMLoaded: new Set<string>(),
  }

-  function normalizeResource(resource: string | string[] | undefined): string[] {
-    if (!resource) return []
-    if (Array.isArray(resource)) return resource
-    return [resource]
-  }
-
  for (const component of allComponents) {
    const { css, beforeDOMLoaded, afterDOMLoaded } = component
-    const normalizedCss = normalizeResource(css)
-    const normalizedBeforeDOMLoaded = normalizeResource(beforeDOMLoaded)
-    const normalizedAfterDOMLoaded = normalizeResource(afterDOMLoaded)
-
-    normalizedCss.forEach((c) => componentResources.css.add(c))
-    normalizedBeforeDOMLoaded.forEach((b) => componentResources.beforeDOMLoaded.add(b))
-    normalizedAfterDOMLoaded.forEach((a) => componentResources.afterDOMLoaded.add(a))
+    if (css) {
+      componentResources.css.add(css)
+    }
+    if (beforeDOMLoaded) {
+      componentResources.beforeDOMLoaded.add(beforeDOMLoaded)
+    }
+    if (afterDOMLoaded) {
+      componentResources.afterDOMLoaded.add(afterDOMLoaded)
+    }
  }

  return {
@@ -207,7 +203,8 @@ export const ComponentResources: QuartzEmitterPlugin = () => {
    async getDependencyGraph(_ctx, _content, _resources) {
      return new DepGraph<FilePath>()
    },
-    async *emit(ctx, _content, _resources) {
+    async emit(ctx, _content, _resources): Promise<FilePath[]> {
+      const promises: Promise<FilePath>[] = []
      const cfg = ctx.cfg.configuration
      // component specific scripts and styles
      const componentResources = getComponentResources(ctx)
@@ -216,35 +213,42 @@ export const ComponentResources: QuartzEmitterPlugin = () => {
        // let the user do it themselves in css
      } else if (cfg.theme.fontOrigin === "googleFonts" && !cfg.theme.cdnCaching) {
        // when cdnCaching is true, we link to google fonts in Head.tsx
-        const response = await fetch(googleFontHref(ctx.cfg.configuration.theme))
-        googleFontsStyleSheet = await response.text()
+        let match

-        if (!cfg.baseUrl) {
-          throw new Error(
-            "baseUrl must be defined when using Google Fonts without cfg.theme.cdnCaching",
+        const fontSourceRegex = /url\((https:\/\/fonts.gstatic.com\/s\/[^)]+\.(woff2|ttf))\)/g
+
+        googleFontsStyleSheet = await (
+          await fetch(googleFontHref(ctx.cfg.configuration.theme))
+        ).text()
+
+        while ((match = fontSourceRegex.exec(googleFontsStyleSheet)) !== null) {
+          // match[0] is the `url(path)`, match[1] is the `path`
+          const url = match[1]
+          // the static name of this file.
+          const [filename, ext] = url.split("/").pop()!.split(".")
+
+          googleFontsStyleSheet = googleFontsStyleSheet.replace(
+            url,
+            `https://${cfg.baseUrl}/static/fonts/${filename}.ttf`,
          )
-        }

-        const { processedStylesheet, fontFiles } = await processGoogleFonts(
-          googleFontsStyleSheet,
-          cfg.baseUrl,
-        )
-        googleFontsStyleSheet = processedStylesheet
-
-        // Download and save font files
-        for (const fontFile of fontFiles) {
-          const res = await fetch(fontFile.url)
+          promises.push(
+            fetch(url)
+              .then((res) => {
                if (!res.ok) {
-            throw new Error(`failed to fetch font ${fontFile.filename}`)
+                  throw new Error(`Failed to fetch font`)
                }
-
-          const buf = await res.arrayBuffer()
-          yield write({
-            ctx,
-            slug: joinSegments("static", "fonts", fontFile.filename) as FullSlug,
-            ext: `.${fontFile.extension}`,
-            content: Buffer.from(buf),
+                return res.arrayBuffer()
              })
+              .then((buf) =>
+                write({
+                  ctx,
+                  slug: joinSegments("static", "fonts", filename) as FullSlug,
+                  ext: `.${ext}`,
+                  content: Buffer.from(buf),
+                }),
+              ),
+          )
        }
      }

@@ -259,13 +263,13 @@ export const ComponentResources: QuartzEmitterPlugin = () => {
        ...componentResources.css,
        styles,
      )
-
      const [prescript, postscript] = await Promise.all([
        joinScripts(componentResources.beforeDOMLoaded),
        joinScripts(componentResources.afterDOMLoaded),
      ])

-      yield write({
+      promises.push(
+        write({
          ctx,
          slug: "index" as FullSlug,
          ext: ".css",
@@ -283,18 +287,21 @@ export const ComponentResources: QuartzEmitterPlugin = () => {
            include: Features.MediaQueries,
          }).code.toString(),
        }),
-        yield write({
+        write({
          ctx,
          slug: "prescript" as FullSlug,
          ext: ".js",
          content: prescript,
        }),
-        yield write({
+        write({
          ctx,
          slug: "postscript" as FullSlug,
          ext: ".js",
          content: postscript,
-        })
+        }),
+      )
+
+      return await Promise.all(promises)
    },
  }
 }
--- a/quartz/plugins/emitters/contentIndex.tsx
+++ b/quartz/plugins/emitters/contentIndex.tsx
@@ -116,8 +116,9 @@ export const ContentIndex: QuartzEmitterPlugin<Partial<Options>> = (opts) => {

      return graph
    },
-    async *emit(ctx, content, _resources) {
+    async emit(ctx, content, _resources) {
      const cfg = ctx.cfg.configuration
+      const emitted: FilePath[] = []
      const linkIndex: ContentIndexMap = new Map()
      for (const [tree, file] of content) {
        const slug = file.data.slug!
@@ -139,21 +140,25 @@ export const ContentIndex: QuartzEmitterPlugin<Partial<Options>> = (opts) => {
      }

      if (opts?.enableSiteMap) {
-        yield write({
+        emitted.push(
+          await write({
            ctx,
            content: generateSiteMap(cfg, linkIndex),
            slug: "sitemap" as FullSlug,
            ext: ".xml",
-        })
+          }),
+        )
      }

      if (opts?.enableRSS) {
-        yield write({
+        emitted.push(
+          await write({
            ctx,
            content: generateRSSFeed(cfg, linkIndex, opts.rssLimit),
            slug: (opts?.rssSlug ?? "index") as FullSlug,
            ext: ".xml",
-        })
+          }),
+        )
      }

      const fp = joinSegments("static", "contentIndex") as FullSlug
@@ -168,12 +173,16 @@ export const ContentIndex: QuartzEmitterPlugin<Partial<Options>> = (opts) => {
        }),
      )

-      yield write({
+      emitted.push(
+        await write({
          ctx,
          content: JSON.stringify(simplifiedIndex),
          slug: fp,
          ext: ".json",
-      })
+        }),
+      )
+
+      return emitted
    },
    externalResources: (ctx) => {
      if (opts?.enableRSS) {
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -94,8 +94,9 @@ export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOp

      return graph
    },
-    async *emit(ctx, content, resources) {
+    async emit(ctx, content, resources): Promise<FilePath[]> {
      const cfg = ctx.cfg.configuration
+      const fps: FilePath[] = []
      const allFiles = content.map((c) => c[1].data)

      let containsIndex = false
@@ -117,12 +118,14 @@ export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOp
        }

        const content = renderPage(cfg, slug, componentData, opts, externalResources)
-        yield write({
+        const fp = await write({
          ctx,
          content,
          slug,
          ext: ".html",
        })
+
+        fps.push(fp)
      }

      if (!containsIndex && !ctx.argv.fastRebuild) {
@@ -132,6 +135,8 @@ export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOp
          ),
        )
      }
+
+      return fps
    },
  }
 }
--- a/quartz/plugins/emitters/folderPage.tsx
+++ b/quartz/plugins/emitters/folderPage.tsx
@@ -69,7 +69,8 @@ export const FolderPage: QuartzEmitterPlugin<Partial<FolderPageOptions>> = (user

      return graph
    },
-    async *emit(ctx, content, resources) {
+    async emit(ctx, content, resources): Promise<FilePath[]> {
+      const fps: FilePath[] = []
      const allFiles = content.map((c) => c[1].data)
      const cfg = ctx.cfg.configuration

@@ -118,13 +119,16 @@ export const FolderPage: QuartzEmitterPlugin<Partial<FolderPageOptions>> = (user
        }

        const content = renderPage(cfg, slug, componentData, opts, externalResources)
-        yield write({
+        const fp = await write({
          ctx,
          content,
          slug,
          ext: ".html",
        })
+
+        fps.push(fp)
      }
+      return fps
    },
  }
 }
--- a/quartz/plugins/emitters/helpers.ts
+++ b/quartz/plugins/emitters/helpers.ts
@@ -2,13 +2,12 @@ import path from "path"
 import fs from "fs"
 import { BuildCtx } from "../../util/ctx"
 import { FilePath, FullSlug, joinSegments } from "../../util/path"
-import { Readable } from "stream"

 type WriteOptions = {
  ctx: BuildCtx
  slug: FullSlug
  ext: `.${string}` | ""
-  content: string | Buffer | Readable
+  content: string | Buffer
 }

 export const write = async ({ ctx, slug, ext, content }: WriteOptions): Promise<FilePath> => {
--- a/quartz/plugins/emitters/index.ts
+++ b/quartz/plugins/emitters/index.ts
@@ -8,4 +8,3 @@ export { Static } from "./static"
 export { ComponentResources } from "./componentResources"
 export { NotFoundPage } from "./404"
 export { CNAME } from "./cname"
-export { CustomOgImages } from "./ogImage"
--- a/quartz/plugins/emitters/ogImage.tsx
+++ b/quartz/plugins/emitters/ogImage.tsx
@@ -1,135 +0,0 @@
-import { QuartzEmitterPlugin } from "../types"
-import { i18n } from "../../i18n"
-import { unescapeHTML } from "../../util/escape"
-import { FullSlug, getFileExtension } from "../../util/path"
-import { ImageOptions, SocialImageOptions, defaultImage, getSatoriFont } from "../../util/og"
-import { getFontSpecificationName } from "../../util/theme"
-import sharp from "sharp"
-import satori from "satori"
-import { loadEmoji, getIconCode } from "../../util/emoji"
-import { Readable } from "stream"
-import { write } from "./helpers"
-
-const defaultOptions: SocialImageOptions = {
-  colorScheme: "lightMode",
-  width: 1200,
-  height: 630,
-  imageStructure: defaultImage,
-  excludeRoot: false,
-}
-
-/**
- * Generates social image (OG/twitter standard) and saves it as `.webp` inside the public folder
- * @param opts options for generating image
- */
-async function generateSocialImage(
-  { cfg, description, fonts, title, fileData }: ImageOptions,
-  userOpts: SocialImageOptions,
-): Promise<Readable> {
-  const { width, height } = userOpts
-  const imageComponent = userOpts.imageStructure(cfg, userOpts, title, description, fonts, fileData)
-  const svg = await satori(imageComponent, {
-    width,
-    height,
-    fonts,
-    loadAdditionalAsset: async (languageCode: string, segment: string) => {
-      if (languageCode === "emoji") {
-        return `data:image/svg+xml;base64,${btoa(await loadEmoji(getIconCode(segment)))}`
-      }
-      return languageCode
-    },
-  })
-
-  return sharp(Buffer.from(svg)).webp({ quality: 40 })
-}
-
-export const CustomOgImagesEmitterName = "CustomOgImages"
-export const CustomOgImages: QuartzEmitterPlugin<Partial<SocialImageOptions>> = (userOpts) => {
-  const fullOptions = { ...defaultOptions, ...userOpts }
-
-  return {
-    name: CustomOgImagesEmitterName,
-    getQuartzComponents() {
-      return []
-    },
-    async *emit(ctx, content, _resources) {
-      const cfg = ctx.cfg.configuration
-      const headerFont = getFontSpecificationName(cfg.theme.typography.header)
-      const bodyFont = getFontSpecificationName(cfg.theme.typography.body)
-      const fonts = await getSatoriFont(headerFont, bodyFont)
-
-      for (const [_tree, vfile] of content) {
-        // if this file defines socialImage, we can skip
-        if (vfile.data.frontmatter?.socialImage !== undefined) {
-          continue
-        }
-
-        const slug = vfile.data.slug!
-        const titleSuffix = cfg.pageTitleSuffix ?? ""
-        const title =
-          (vfile.data.frontmatter?.title ?? i18n(cfg.locale).propertyDefaults.title) + titleSuffix
-        const description =
-          vfile.data.frontmatter?.socialDescription ??
-          vfile.data.frontmatter?.description ??
-          unescapeHTML(
-            vfile.data.description?.trim() ?? i18n(cfg.locale).propertyDefaults.description,
-          )
-
-        const stream = await generateSocialImage(
-          {
-            title,
-            description,
-            fonts,
-            cfg,
-            fileData: vfile.data,
-          },
-          fullOptions,
-        )
-
-        yield write({
-          ctx,
-          content: stream,
-          slug: `${slug}-og-image` as FullSlug,
-          ext: ".webp",
-        })
-      }
-    },
-    externalResources: (ctx) => {
-      if (!ctx.cfg.configuration.baseUrl) {
-        return {}
-      }
-
-      const baseUrl = ctx.cfg.configuration.baseUrl
-      return {
-        additionalHead: [
-          (pageData) => {
-            const isRealFile = pageData.filePath !== undefined
-            const userDefinedOgImagePath = pageData.frontmatter?.socialImage
-            const generatedOgImagePath = isRealFile
-              ? `https://${baseUrl}/${pageData.slug!}-og-image.webp`
-              : undefined
-            const defaultOgImagePath = `https://${baseUrl}/static/og-image.png`
-            const ogImagePath = userDefinedOgImagePath ?? generatedOgImagePath ?? defaultOgImagePath
-
-            const ogImageMimeType = `image/${getFileExtension(ogImagePath) ?? "png"}`
-            return (
-              <>
-                {!userDefinedOgImagePath && (
-                  <>
-                    <meta property="og:image:width" content={fullOptions.width.toString()} />
-                    <meta property="og:image:height" content={fullOptions.height.toString()} />
-                  </>
-                )}
-
-                <meta property="og:image" content={ogImagePath} />
-                <meta property="og:image:url" content={ogImagePath} />
-                <meta name="twitter:image" content={ogImagePath} />
-                <meta property="og:image:type" content={ogImageMimeType} />
-              </>
-            )
-          },
-        ],
-      }
-    },
-  }
-}
--- a/quartz/plugins/emitters/static.ts
+++ b/quartz/plugins/emitters/static.ts
@@ -3,7 +3,6 @@ import { QuartzEmitterPlugin } from "../types"
 import fs from "fs"
 import { glob } from "../../util/glob"
 import DepGraph from "../../depgraph"
-import { dirname } from "path"

 export const Static: QuartzEmitterPlugin = () => ({
  name: "Static",
@@ -21,17 +20,13 @@ export const Static: QuartzEmitterPlugin = () => ({

    return graph
  },
-  async *emit({ argv, cfg }, _content) {
+  async emit({ argv, cfg }, _content, _resources): Promise<FilePath[]> {
    const staticPath = joinSegments(QUARTZ, "static")
    const fps = await glob("**", staticPath, cfg.configuration.ignorePatterns)
-    const outputStaticPath = joinSegments(argv.output, "static")
-    await fs.promises.mkdir(outputStaticPath, { recursive: true })
-    for (const fp of fps) {
-      const src = joinSegments(staticPath, fp) as FilePath
-      const dest = joinSegments(outputStaticPath, fp) as FilePath
-      await fs.promises.mkdir(dirname(dest), { recursive: true })
-      await fs.promises.copyFile(src, dest)
-      yield dest
-    }
+    await fs.promises.cp(staticPath, joinSegments(argv.output, "static"), {
+      recursive: true,
+      dereference: true,
+    })
+    return fps.map((fp) => joinSegments(argv.output, "static", fp)) as FilePath[]
  },
 })
--- a/quartz/plugins/emitters/tagPage.tsx
+++ b/quartz/plugins/emitters/tagPage.tsx
@@ -71,7 +71,8 @@ export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts)

      return graph
    },
-    async *emit(ctx, content, resources) {
+    async emit(ctx, content, resources): Promise<FilePath[]> {
+      const fps: FilePath[] = []
      const allFiles = content.map((c) => c[1].data)
      const cfg = ctx.cfg.configuration

@@ -126,13 +127,16 @@ export const TagPage: QuartzEmitterPlugin<Partial<TagPageOptions>> = (userOpts)
        }

        const content = renderPage(cfg, slug, componentData, opts, externalResources)
-        yield write({
+        const fp = await write({
          ctx,
          content,
          slug: file.data.slug!,
          ext: ".html",
        })
+
+        fps.push(fp)
      }
+      return fps
    },
  }
 }
--- a/quartz/plugins/transformers/frontmatter.ts
+++ b/quartz/plugins/transformers/frontmatter.ts
@@ -131,7 +131,6 @@ declare module "vfile" {
        created: string
        published: string
        description: string
-        socialDescription: string
        publish: boolean | string
        draft: boolean | string
        lang: string
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -16,12 +16,9 @@ import path from "path"
 import { splitAnchor } from "../../util/path"
 import { JSResource, CSSResource } from "../../util/resources"
 // @ts-ignore
-import calloutScript from "../../components/scripts/callout.inline"
+import calloutScript from "../../components/scripts/callout.inline.ts"
 // @ts-ignore
-import checkboxScript from "../../components/scripts/checkbox.inline"
-// @ts-ignore
-import mermaidScript from "../../components/scripts/mermaid.inline"
-import mermaidStyle from "../../components/styles/mermaid.inline.scss"
+import checkboxScript from "../../components/scripts/checkbox.inline.ts"
 import { FilePath, pathToRoot, slugTag, slugifyFilePath } from "../../util/path"
 import { toHast } from "mdast-util-to-hast"
 import { toHtml } from "hast-util-to-html"
@@ -675,6 +672,7 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>>
                    properties: {
                      className: ["expand-button"],
                      "aria-label": "Expand mermaid diagram",
+                      "aria-hidden": "true",
                      "data-view-component": true,
                    },
                    children: [
@@ -705,13 +703,70 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>>
                  {
                    type: "element",
                    tagName: "div",
-                    properties: { id: "mermaid-container", role: "dialog" },
+                    properties: { id: "mermaid-container" },
                    children: [
                      {
                        type: "element",
                        tagName: "div",
                        properties: { id: "mermaid-space" },
                        children: [
+                          {
+                            type: "element",
+                            tagName: "div",
+                            properties: { className: ["mermaid-header"] },
+                            children: [
+                              {
+                                type: "element",
+                                tagName: "button",
+                                properties: {
+                                  className: ["close-button"],
+                                  "aria-label": "close button",
+                                },
+                                children: [
+                                  {
+                                    type: "element",
+                                    tagName: "svg",
+                                    properties: {
+                                      "aria-hidden": "true",
+                                      xmlns: "http://www.w3.org/2000/svg",
+                                      width: 24,
+                                      height: 24,
+                                      viewBox: "0 0 24 24",
+                                      fill: "none",
+                                      stroke: "currentColor",
+                                      "stroke-width": "2",
+                                      "stroke-linecap": "round",
+                                      "stroke-linejoin": "round",
+                                    },
+                                    children: [
+                                      {
+                                        type: "element",
+                                        tagName: "line",
+                                        properties: {
+                                          x1: 18,
+                                          y1: 6,
+                                          x2: 6,
+                                          y2: 18,
+                                        },
+                                        children: [],
+                                      },
+                                      {
+                                        type: "element",
+                                        tagName: "line",
+                                        properties: {
+                                          x1: 6,
+                                          y1: 6,
+                                          x2: 18,
+                                          y2: 18,
+                                        },
+                                        children: [],
+                                      },
+                                    ],
+                                  },
+                                ],
+                              },
+                            ],
+                          },
                          {
                            type: "element",
                            tagName: "div",
@@ -751,20 +806,6 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>>
        })
      }

-      if (opts.mermaid) {
-        js.push({
-          script: mermaidScript,
-          loadTime: "afterDOMReady",
-          contentType: "inline",
-          moduleType: "module",
-        })
-
-        css.push({
-          content: mermaidStyle,
-          inline: true,
-        })
-      }
-
      return { js, css }
    },
  }
--- a/quartz/plugins/types.ts
+++ b/quartz/plugins/types.ts
@@ -38,11 +38,7 @@ export type QuartzEmitterPlugin<Options extends OptionType = undefined> = (
 ) => QuartzEmitterPluginInstance
 export type QuartzEmitterPluginInstance = {
  name: string
-  emit(
-    ctx: BuildCtx,
-    content: ProcessedContent[],
-    resources: StaticResources,
-  ): Promise<FilePath[]> | AsyncGenerator<FilePath>
+  emit(ctx: BuildCtx, content: ProcessedContent[], resources: StaticResources): Promise<FilePath[]>
  /**
   * Returns the components (if any) that are used in rendering the page.
   * This helps Quartz optimize the page by only including necessary resources
--- a/quartz/processors/emit.ts
+++ b/quartz/processors/emit.ts
@@ -14,34 +14,20 @@ export async function emitContent(ctx: BuildCtx, content: ProcessedContent[]) {

  let emittedFiles = 0
  const staticResources = getStaticResourcesFromPlugins(ctx)
-  await Promise.all(
-    cfg.plugins.emitters.map(async (emitter) => {
+  for (const emitter of cfg.plugins.emitters) {
    try {
      const emitted = await emitter.emit(ctx, content, staticResources)
-        if (Symbol.asyncIterator in emitted) {
-          // Async generator case
-          const files: string[] = []
-          for await (const file of emitted) {
-            files.push(file)
-            emittedFiles++
-            if (ctx.argv.verbose) {
-              console.log(`[emit:${emitter.name}] ${file}`)
-            }
-          }
-        } else {
-          // Array case
      emittedFiles += emitted.length
+
      if (ctx.argv.verbose) {
        for (const file of emitted) {
          console.log(`[emit:${emitter.name}] ${file}`)
        }
      }
-        }
    } catch (err) {
      trace(`Failed to emit from plugin \`${emitter.name}\``, err as Error)
    }
-    }),
-  )
+  }

  log.end(`Emitted ${emittedFiles} files to \`${argv.output}\` in ${perf.timeSince()}`)
 }
--- a/quartz/styles/base.scss
+++ b/quartz/styles/base.scss
@@ -351,10 +351,6 @@ h6 {
  &[id]:hover > a {
    opacity: 1;
  }
-
-  &:not([id]) > a[role="anchor"] {
-    display: none;
-  }
 }

 // typography improvements
@@ -542,7 +538,7 @@ video {
 }

 .spacer {
-  flex: 2 1 auto;
+  flex: 1 1 auto;
 }

 div:has(> .overflow) {
@@ -555,14 +551,17 @@ ol.overflow {
  max-height: 100%;
  overflow-y: auto;
  width: 100%;
-  margin-bottom: 0;

  // clearfix
  content: "";
  clear: both;

+  & > li:last-of-type {
+    margin-bottom: 30px;
+  }
+
  & > li.overflow-end {
-    height: 1rem;
+    height: 4px;
    margin: 0;
  }

--- a/quartz/util/fileTrie.test.ts
+++ b/quartz/util/fileTrie.test.ts
@@ -11,15 +11,16 @@ describe("FileTrie", () => {
  let trie: FileTrieNode<TestData>

  beforeEach(() => {
-    trie = new FileTrieNode<TestData>([])
+    trie = new FileTrieNode<TestData>("")
  })

  describe("constructor", () => {
    test("should create an empty trie", () => {
      assert.deepStrictEqual(trie.children, [])
-      assert.strictEqual(trie.slug, "")
+      assert.strictEqual(trie.slugSegment, "")
      assert.strictEqual(trie.displayName, "")
      assert.strictEqual(trie.data, null)
+      assert.strictEqual(trie.depth, 0)
    })

    test("should set displayName from data title", () => {
@@ -42,7 +43,7 @@ describe("FileTrie", () => {

      trie.add(data)
      assert.strictEqual(trie.children.length, 1)
-      assert.strictEqual(trie.children[0].slug, "test")
+      assert.strictEqual(trie.children[0].slugSegment, "test")
      assert.strictEqual(trie.children[0].data, data)
    })

@@ -71,20 +72,20 @@ describe("FileTrie", () => {
      trie.add(data1)
      trie.add(data2)
      assert.strictEqual(trie.children.length, 2)
-      assert.strictEqual(trie.children[0].slug, "folder/index")
+      assert.strictEqual(trie.children[0].slugSegment, "folder")
      assert.strictEqual(trie.children[0].children.length, 1)
-      assert.strictEqual(trie.children[0].children[0].slug, "folder/test")
+      assert.strictEqual(trie.children[0].children[0].slugSegment, "test")
      assert.strictEqual(trie.children[0].children[0].data, data1)

-      assert.strictEqual(trie.children[1].slug, "a/index")
+      assert.strictEqual(trie.children[1].slugSegment, "a")
      assert.strictEqual(trie.children[1].children.length, 1)
      assert.strictEqual(trie.children[1].data, null)

-      assert.strictEqual(trie.children[1].children[0].slug, "a/b/index")
+      assert.strictEqual(trie.children[1].children[0].slugSegment, "b")
      assert.strictEqual(trie.children[1].children[0].children.length, 1)
      assert.strictEqual(trie.children[1].children[0].data, null)

-      assert.strictEqual(trie.children[1].children[0].children[0].slug, "a/b/c/index")
+      assert.strictEqual(trie.children[1].children[0].children[0].slugSegment, "c")
      assert.strictEqual(trie.children[1].children[0].children[0].data, data2)
      assert.strictEqual(trie.children[1].children[0].children[0].children.length, 0)
    })
@@ -98,9 +99,9 @@ describe("FileTrie", () => {
      trie.add(data1)
      trie.add(data2)

-      trie.filter((node) => node.slug !== "test1")
+      trie.filter((node) => node.slugSegment !== "test1")
      assert.strictEqual(trie.children.length, 1)
-      assert.strictEqual(trie.children[0].slug, "test2")
+      assert.strictEqual(trie.children[0].slugSegment, "test2")
    })
  })

@@ -114,7 +115,7 @@ describe("FileTrie", () => {

      trie.map((node) => {
        if (node.data) {
-          node.data.title = "Modified"
+          node.displayName = "Modified"
        }
      })

@@ -135,7 +136,7 @@ describe("FileTrie", () => {
      assert.deepStrictEqual(
        entries.map(([path, node]) => [path, node.data]),
        [
-          ["index", trie.data],
+          ["", trie.data],
          ["test1", data1],
          ["a/index", null],
          ["a/b/index", null],
@@ -165,12 +166,7 @@ describe("FileTrie", () => {
      trie.add(data3)
      const paths = trie.getFolderPaths()

-      assert.deepStrictEqual(paths, [
-        "index",
-        "folder/index",
-        "folder/subfolder/index",
-        "abc/index",
-      ])
+      assert.deepStrictEqual(paths, ["folder/index", "folder/subfolder/index", "abc/index"])
    })
  })

@@ -184,9 +180,9 @@ describe("FileTrie", () => {
      trie.add(data1)
      trie.add(data2)

-      trie.sort((a, b) => a.slug.localeCompare(b.slug))
+      trie.sort((a, b) => a.slugSegment.localeCompare(b.slugSegment))
      assert.deepStrictEqual(
-        trie.children.map((n) => n.slug),
+        trie.children.map((n) => n.slugSegment),
        ["a", "b", "c"],
      )
    })
--- a/quartz/util/fileTrie.ts
+++ b/quartz/util/fileTrie.ts
@@ -7,64 +7,55 @@ interface FileTrieData {
 }

 export class FileTrieNode<T extends FileTrieData = ContentDetails> {
-  isFolder: boolean
  children: Array<FileTrieNode<T>>
-
-  private slugSegments: string[]
+  slugSegment: string
+  displayName: string
  data: T | null
+  depth: number
+  isFolder: boolean

-  constructor(segments: string[], data?: T) {
+  constructor(segment: string, data?: T, depth: number = 0) {
    this.children = []
-    this.slugSegments = segments
+    this.slugSegment = segment
+    this.displayName = data?.title ?? segment
    this.data = data ?? null
-    this.isFolder = false
-  }
-
-  get displayName(): string {
-    return this.data?.title ?? this.slugSegment ?? ""
-  }
-
-  get slug(): FullSlug {
-    const path = joinSegments(...this.slugSegments) as FullSlug
-    if (this.isFolder) {
-      return joinSegments(path, "index") as FullSlug
-    }
-
-    return path
-  }
-
-  get slugSegment(): string {
-    return this.slugSegments[this.slugSegments.length - 1]
-  }
-
-  private makeChild(path: string[], file?: T) {
-    const fullPath = [...this.slugSegments, path[0]]
-    const child = new FileTrieNode<T>(fullPath, file)
-    this.children.push(child)
-    return child
+    this.depth = depth
+    this.isFolder = segment === "index"
  }

  private insert(path: string[], file: T) {
-    if (path.length === 0) {
-      throw new Error("path is empty")
+    if (path.length === 0) return
+
+    const nextSegment = path[0]
+
+    // base case, insert here
+    if (path.length === 1) {
+      if (nextSegment === "index") {
+        // index case (we are the root and we just found index.md)
+        this.data ??= file
+        const title = file.title
+        if (title !== "index") {
+          this.displayName = title
+        }
+      } else {
+        // direct child
+        this.children.push(new FileTrieNode(nextSegment, file, this.depth + 1))
+        this.isFolder = true
      }

-    // if we are inserting, we are a folder
-    this.isFolder = true
-    const segment = path[0]
-    if (path.length === 1) {
-      // base case, we are at the end of the path
-      if (segment === "index") {
-        this.data ??= file
-      } else {
-        this.makeChild(path, file)
+      return
    }
-    } else if (path.length > 1) {
-      // recursive case, we are not at the end of the path
-      const child =
-        this.children.find((c) => c.slugSegment === segment) ?? this.makeChild(path, undefined)
-      child.insert(path.slice(1), file)
+
+    // find the right child to insert into, creating it if it doesn't exist
+    path = path.splice(1)
+    let child = this.children.find((c) => c.slugSegment === nextSegment)
+    if (!child) {
+      child = new FileTrieNode<T>(nextSegment, undefined, this.depth + 1)
+      this.children.push(child)
+      child.isFolder = true
    }
+
+    child.insert(path, file)
  }

  // Add new file to trie
@@ -97,7 +88,7 @@ export class FileTrieNode<T extends FileTrieData = ContentDetails> {
  }

  static fromEntries<T extends FileTrieData>(entries: [FullSlug, T][]) {
-    const trie = new FileTrieNode<T>([])
+    const trie = new FileTrieNode<T>("")
    entries.forEach(([, entry]) => trie.add(entry))
    return trie
  }
@@ -107,12 +98,22 @@ export class FileTrieNode<T extends FileTrieData = ContentDetails> {
   * in the a flat array including the full path and the node
   */
  entries(): [FullSlug, FileTrieNode<T>][] {
-    const traverse = (node: FileTrieNode<T>): [FullSlug, FileTrieNode<T>][] => {
-      const result: [FullSlug, FileTrieNode<T>][] = [[node.slug, node]]
-      return result.concat(...node.children.map(traverse))
+    const traverse = (
+      node: FileTrieNode<T>,
+      currentPath: string,
+    ): [FullSlug, FileTrieNode<T>][] => {
+      const segments = [currentPath, node.slugSegment]
+      const fullPath = joinSegments(...segments) as FullSlug
+
+      const indexQualifiedPath =
+        node.isFolder && node.depth > 0 ? (joinSegments(fullPath, "index") as FullSlug) : fullPath
+
+      const result: [FullSlug, FileTrieNode<T>][] = [[indexQualifiedPath, node]]
+
+      return result.concat(...node.children.map((child) => traverse(child, fullPath)))
    }

-    return traverse(this)
+    return traverse(this, "")
  }

  /**
--- a/quartz/util/og.tsx
+++ b/quartz/util/og.tsx
@@ -15,10 +15,8 @@ export async function getSatoriFont(headerFontName: string, bodyFontName: string
  const bodyWeight = 400 as FontWeight

  // Fetch fonts
-  const [headerFont, bodyFont] = await Promise.all([
-    fetchTtf(headerFontName, headerWeight),
-    fetchTtf(bodyFontName, bodyWeight),
-  ])
+  const headerFont = await fetchTtf(headerFontName, headerWeight)
+  const bodyFont = await fetchTtf(bodyFontName, bodyWeight)

  // Convert fonts to satori font format and return
  const fonts: SatoriOptions["fonts"] = [
@@ -28,23 +26,13 @@ export async function getSatoriFont(headerFontName: string, bodyFontName: string
  return fonts
 }

-// Cache for memoizing font data
-const fontCache = new Map<string, Promise<ArrayBuffer>>()
-
 /**
 * Get the `.ttf` file of a google font
 * @param fontName name of google font
 * @param weight what font weight to fetch font
 * @returns `.ttf` file of google font
 */
-export async function fetchTtf(fontName: string, weight: FontWeight): Promise<ArrayBuffer> {
-  const cacheKey = `${fontName}-${weight}`
-  if (fontCache.has(cacheKey)) {
-    return fontCache.get(cacheKey)!
-  }
-
-  // If not in cache, fetch and store the promise
-  const fontPromise = (async () => {
+async function fetchTtf(fontName: string, weight: FontWeight): Promise<ArrayBuffer> {
  try {
    // Get css file from google fonts
    const cssResponse = await fetch(
@@ -60,16 +48,16 @@ export async function fetchTtf(fontName: string, weight: FontWeight): Promise<Ar
      throw new Error("Could not fetch font")
    }

-      // fontData is an ArrayBuffer containing the .ttf file data (get match[1] due to google fonts response format, always contains link twice, but second entry is the "raw" link)
+    // Retrieve font data as ArrayBuffer
    const fontResponse = await fetch(match[1])
-      return await fontResponse.arrayBuffer()
+
+    // fontData is an ArrayBuffer containing the .ttf file data (get match[1] due to google fonts response format, always contains link twice, but second entry is the "raw" link)
+    const fontData = await fontResponse.arrayBuffer()
+
+    return fontData
  } catch (error) {
    throw new Error(`Error fetching font: ${error}`)
  }
-  })()
-
-  fontCache.set(cacheKey, fontPromise)
-  return fontPromise
 }

 export type SocialImageOptions = {
@@ -120,10 +108,22 @@ export type ImageOptions = {
   * what description to use as body in image
   */
  description: string
+  /**
+   * what fileName to use when writing to disk
+   */
+  fileName: string
+  /**
+   * what directory to store image in
+   */
+  fileDir: string
+  /**
+   * what file extension to use (should be `webp` unless you also change sharp conversion)
+   */
+  fileExt: string
  /**
   * header + body font to be used when generating satori image (as promise to work around sync in component)
   */
-  fonts: SatoriOptions["fonts"]
+  fontsPromise: Promise<SatoriOptions["fonts"]>
  /**
   * `GlobalConfiguration` of quartz (used for theme/typography)
   */
--- a/quartz/util/path.ts
+++ b/quartz/util/path.ts
@@ -36,7 +36,7 @@ export type RelativeURL = SlugLike<"relative">
 export function isRelativeURL(s: string): s is RelativeURL {
  const validStart = /^\.{1,2}/.test(s)
  const validEnding = !endsWith(s, "index")
-  return validStart && validEnding && ![".md", ".html"].includes(getFileExtension(s) ?? "")
+  return validStart && validEnding && ![".md", ".html"].includes(_getFileExtension(s) ?? "")
 }

 export function getFullSlug(window: Window): FullSlug {
@@ -61,7 +61,7 @@ function sluggify(s: string): string {

 export function slugifyFilePath(fp: FilePath, excludeExt?: boolean): FullSlug {
  fp = stripSlashes(fp) as FilePath
-  let ext = getFileExtension(fp)
+  let ext = _getFileExtension(fp)
  const withoutFileExt = fp.replace(new RegExp(ext + "$"), "")
  if (excludeExt || [".md", ".html", undefined].includes(ext)) {
    ext = ""
@@ -272,10 +272,10 @@ function containsForbiddenCharacters(s: string): boolean {
 }

 function _hasFileExtension(s: string): boolean {
-  return getFileExtension(s) !== undefined
+  return _getFileExtension(s) !== undefined
 }

-export function getFileExtension(s: string): string | undefined {
+function _getFileExtension(s: string): string | undefined {
  return s.match(/\.[A-Za-z0-9]+$/)?.[0]
 }

--- a/quartz/util/random.ts
+++ b/quartz/util/random.ts
@@ -1,3 +0,0 @@
-export function randomIdNonSecure() {
-  return Math.random().toString(36).substring(2, 8)
-}
--- a/quartz/util/resources.tsx
+++ b/quartz/util/resources.tsx
@@ -65,10 +65,3 @@ export interface StaticResources {
  js: JSResource[]
  additionalHead: (JSX.Element | ((pageData: QuartzPluginData) => JSX.Element))[]
 }
-
-export type StringResource = string | string[] | undefined
-export function concatenateResources(...resources: StringResource[]): StringResource {
-  return resources
-    .filter((resource): resource is string | string[] => resource !== undefined)
-    .flat()
-}
--- a/quartz/util/theme.ts
+++ b/quartz/util/theme.ts
@@ -90,36 +90,6 @@ export function googleFontHref(theme: Theme) {
  return `https://fonts.googleapis.com/css2?family=${bodyFont}&family=${headerFont}&family=${codeFont}&display=swap`
 }

-export interface GoogleFontFile {
-  url: string
-  filename: string
-  extension: string
-}
-
-export async function processGoogleFonts(
-  stylesheet: string,
-  baseUrl: string,
-): Promise<{
-  processedStylesheet: string
-  fontFiles: GoogleFontFile[]
-}> {
-  const fontSourceRegex = /url\((https:\/\/fonts.gstatic.com\/s\/[^)]+\.(woff2|ttf))\)/g
-  const fontFiles: GoogleFontFile[] = []
-  let processedStylesheet = stylesheet
-
-  let match
-  while ((match = fontSourceRegex.exec(stylesheet)) !== null) {
-    const url = match[1]
-    const [filename, extension] = url.split("/").pop()!.split(".")
-    const staticUrl = `https://${baseUrl}/static/fonts/${filename}.${extension}`
-
-    processedStylesheet = processedStylesheet.replace(url, staticUrl)
-    fontFiles.push({ url, filename, extension })
-  }
-
-  return { processedStylesheet, fontFiles }
-}
-
 export function joinStyles(theme: Theme, ...stylesheet: string[]) {
  return `
 ${stylesheet.join("\n\n")}
Author	SHA1	Message	Date
Jacky Zhao	d02bb0f044	more style fixes	2025-03-09 14:49:53 -07:00
Jacky Zhao	e320324cf2	make mobile look nice	2025-03-09 14:03:10 -07:00
Jacky Zhao	9f8a8c83e5	open folders that are prefixes of current path	2025-03-09 10:05:27 -07:00
Jacky Zhao	1176deab7e	make flex more consistent, remove transition	2025-03-09 09:57:12 -07:00
Jacky Zhao	2802aa91f4	add highlight class	2025-03-09 09:20:35 -07:00
Jacky Zhao	50efa14bd2	add prenav hook	2025-03-09 09:04:04 -07:00
Jacky Zhao	26ff78f81f	generic test flag	2025-03-08 21:34:04 -08:00
Jacky Zhao	0cacd48458	fmt	2025-03-08 21:23:27 -08:00
Jacky Zhao	51790b3926	fix tests	2025-03-08 20:48:03 -08:00
Jacky Zhao	08717394ff	start work on client side explorer	2025-03-06 22:35:24 -08:00