From 23df17233da3f16db5166cf8a05b2089bd1f006a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 10 Mar 2025 18:39:08 +0000
Subject: [PATCH] fix(graph): make graph non-singleton, proper cleanup, fix radial
---
quartz/components/Head.tsx | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index a8e4974..b6a7e8d 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,9 +1,10 @@
import { i18n } from "../i18n"
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"
@@ -24,7 +25,18 @@
// 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 })
+ 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()
@@ -65,7 +77,9 @@
// Memoize google fonts
if (!fontsPromise && cfg.generateSocialImages) {
- fontsPromise = getSatoriFont(cfg.theme.typography.header, cfg.theme.typography.body)
+ const headerFont = getFontSpecificationName(cfg.theme.typography.header)
+ const bodyFont = getFontSpecificationName(cfg.theme.typography.body)
+ fontsPromise = getSatoriFont(headerFont, bodyFont)
}
const slug = fileData.filePath
@@ -98,7 +112,7 @@
if (fileName) {
// Generate social image (happens async)
- generateSocialImage(
+ void generateSocialImage(
{
title,
description,
@@ -115,7 +129,7 @@
}
}
- const { css, js } = externalResources
+ const { css, js, additionalHead } = externalResources
const url = new URL(`https://${cfg.baseUrl ?? "example.com"}`)
const path = url.pathname as FullSlug
@@ -165,6 +179,7 @@
<link rel="stylesheet" href={googleFontHref(cfg.theme)} />
</>
)}
+ <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>
@@ -200,6 +215,13 @@
{js
.filter((resource) => resource.loadTime === "beforeDOMReady")
.map((res) => JSResourceToScriptElement(res, true))}
+ {additionalHead.map((resource) => {
+ if (typeof resource === "function") {
+ return resource(fileData)
+ } else {
+ return resource
+ }
+ })}
</head>
)
}
--
Gitblit v1.10.0