From 5fcba1bfaf8821fbb01cc7e67e01c553ffebfa39 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:02:03 +0000
Subject: [PATCH] chore(deps): bump mdast-util-to-hast from 13.1.0 to 13.2.0 (#1279)
---
quartz/components/Head.tsx | 78 ++++++++++++++++++++++++--------------
1 files changed, 49 insertions(+), 29 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index 16125da..46ba5e0 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,32 +1,52 @@
-import { resolveToRoot } from "../path"
-import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
+import { i18n } from "../i18n"
+import { FullSlug, joinSegments, pathToRoot } from "../util/path"
+import { JSResourceToScriptElement } from "../util/resources"
+import { googleFontHref } from "../util/theme"
+import { QuartzComponent, QuartzComponentConstructor, QuartzComponentProps } from "./types"
-function Head({ fileData, externalResources }: QuartzComponentProps) {
- const slug = fileData.slug!
- const title = fileData.frontmatter?.title ?? "Untitled"
- const description = fileData.description ?? "No description provided"
- const { css, js } = externalResources
- const baseDir = resolveToRoot(slug)
- const iconPath = baseDir + "/static/icon.png"
- const ogImagePath = baseDir + "/static/og-image.png"
+export default (() => {
+ const Head: QuartzComponent = ({ cfg, fileData, externalResources }: QuartzComponentProps) => {
+ const title = fileData.frontmatter?.title ?? i18n(cfg.locale).propertyDefaults.title
+ const description =
+ fileData.description?.trim() ?? i18n(cfg.locale).propertyDefaults.description
+ const { css, js } = externalResources
- return <head>
- <title>{title}</title>
- <meta charSet="utf-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1" />
- <meta property="og:title" content={title} />
- <meta property="og:description" content={title} />
- <meta property="og:image" content={ogImagePath} />
- <meta property="og:width" content="1200" />
- <meta property="og:height" content="675" />
- <link rel="icon" href={iconPath} />
- <meta name="description" content={description} />
- <meta name="generator" content="Quartz" />
- <link rel="preconnect" href="https://fonts.googleapis.com" />
- <link rel="preconnect" href="https://fonts.gstatic.com" />
- {css.map(href => <link key={href} href={href} rel="stylesheet" type="text/css" spa-preserve />)}
- {js.filter(resource => resource.loadTime === "beforeDOMReady").map(resource => <script key={resource.src} {...resource} spa-preserve />)}
- </head>
-}
+ const url = new URL(`https://${cfg.baseUrl ?? "example.com"}`)
+ const path = url.pathname as FullSlug
+ const baseDir = fileData.slug === "404" ? path : pathToRoot(fileData.slug!)
-export default (() => Head) satisfies QuartzComponentConstructor
+ const iconPath = joinSegments(baseDir, "static/icon.png")
+ const ogImagePath = `https://${cfg.baseUrl}/static/og-image.png`
+
+ return (
+ <head>
+ <title>{title}</title>
+ <meta charSet="utf-8" />
+ {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" />
+ <meta property="og:title" content={title} />
+ <meta property="og:description" content={description} />
+ {cfg.baseUrl && <meta property="og:image" content={ogImagePath} />}
+ <meta property="og:width" content="1200" />
+ <meta property="og:height" content="675" />
+ <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 />
+ ))}
+ {js
+ .filter((resource) => resource.loadTime === "beforeDOMReady")
+ .map((res) => JSResourceToScriptElement(res, true))}
+ </head>
+ )
+ }
+
+ return Head
+}) satisfies QuartzComponentConstructor
--
Gitblit v1.10.0