From 06ee73e006fedef64d326aae8909bcc4ca5b243a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 05 Feb 2024 05:22:57 +0000
Subject: [PATCH] fix(path): properly path encode &
---
quartz/components/Head.tsx | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index 44decac..b94909c 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,16 +1,21 @@
-import { canonicalizeServer, pathToRoot } from "../path"
-import { JSResourceToScriptElement } from "../resources"
+import { i18n } from "../i18n"
+import { FullSlug, _stripSlashes, joinSegments, pathToRoot } from "../util/path"
+import { JSResourceToScriptElement } from "../util/resources"
import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
export default (() => {
- function Head({ fileData, externalResources }: QuartzComponentProps) {
- const slug = canonicalizeServer(fileData.slug!)
- const title = fileData.frontmatter?.title ?? "Untitled"
- const description = fileData.description ?? "No description provided"
+ function Head({ 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
- const baseDir = pathToRoot(slug)
- const iconPath = baseDir + "/static/icon.png"
- const ogImagePath = baseDir + "/static/og-image.png"
+
+ 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 ogImagePath = `https://${cfg.baseUrl}/static/og-image.png`
return (
<head>
@@ -18,8 +23,8 @@
<meta charSet="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta property="og:title" content={title} />
- <meta property="og:description" content={title} />
- <meta property="og:image" content={ogImagePath} />
+ <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} />
--
Gitblit v1.10.0