From a6b2967df86895fb5402d4aaa8dfa91417e4d1ab Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Fri, 08 Nov 2024 00:32:26 +0000
Subject: [PATCH] fix: account for chokidar v4 glob deprecation in source watching
---
quartz/components/Head.tsx | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index 3cb6bea..cf79434 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,11 +1,14 @@
import { i18n } from "../i18n"
import { FullSlug, joinSegments, pathToRoot } from "../util/path"
-import { JSResourceToScriptElement } from "../util/resources"
+import { CSSResourceToStyleElement, JSResourceToScriptElement } from "../util/resources"
+import { googleFontHref } from "../util/theme"
import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
export default (() => {
const Head: QuartzComponent = ({ cfg, fileData, externalResources }: QuartzComponentProps) => {
- const title = fileData.frontmatter?.title ?? i18n(cfg.locale).propertyDefaults.title
+ const titleSuffix = cfg.pageTitleSuffix ?? ""
+ const title =
+ (fileData.frontmatter?.title ?? i18n(cfg.locale).propertyDefaults.title) + titleSuffix
const description =
fileData.description?.trim() ?? i18n(cfg.locale).propertyDefaults.description
const { css, js } = externalResources
@@ -21,10 +24,11 @@
<head>
<title>{title}</title>
<meta charSet="utf-8" />
- {cfg.theme.cdnCaching && (
+ {cfg.theme.cdnCaching && cfg.theme.fontOrigin === "googleFonts" && (
<>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
+ <link rel="stylesheet" href={googleFontHref(cfg.theme)} />
</>
)}
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -36,9 +40,7 @@
<link rel="icon" href={iconPath} />
<meta name="description" content={description} />
<meta name="generator" content="Quartz" />
- {css.map((href) => (
- <link key={href} href={href} rel="stylesheet" type="text/css" spa-preserve />
- ))}
+ {css.map((resource) => CSSResourceToStyleElement(resource, true))}
{js
.filter((resource) => resource.loadTime === "beforeDOMReady")
.map((res) => JSResourceToScriptElement(res, true))}
--
Gitblit v1.10.0