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 | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index 0651b95..b94909c 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,15 +1,20 @@
-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({ cfg, fileData, externalResources }: QuartzComponentProps) {
- const slug = canonicalizeServer(fileData.slug!)
- const title = fileData.frontmatter?.title ?? "Untitled"
- const description = fileData.description?.trim() ?? "No description provided"
+ 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 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 (
--
Gitblit v1.10.0