From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/components/Head.tsx | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/quartz/components/Head.tsx b/quartz/components/Head.tsx
index a0b62b7..b370054 100644
--- a/quartz/components/Head.tsx
+++ b/quartz/components/Head.tsx
@@ -1,29 +1,17 @@
-import { resolveToRoot } from "../path"
+import { canonicalizeServer, pathToRoot } from "../path"
import { JSResourceToScriptElement } from "../resources"
import { QuartzComponentConstructor, QuartzComponentProps } from "./types"
-interface Options {
- prefetchContentIndex: boolean
-}
-
-const defaultOptions: Options = {
- prefetchContentIndex: true
-}
-
-export default ((opts?: Options) => {
+export default (() => {
function Head({ fileData, externalResources }: QuartzComponentProps) {
- const slug = fileData.slug!
+ const slug = canonicalizeServer(fileData.slug!)
const title = fileData.frontmatter?.title ?? "Untitled"
const description = fileData.description ?? "No description provided"
const { css, js } = externalResources
- const baseDir = resolveToRoot(slug)
+ const baseDir = pathToRoot(slug)
const iconPath = baseDir + "/static/icon.png"
const ogImagePath = baseDir + "/static/og-image.png"
- const prefetchContentIndex = opts?.prefetchContentIndex ?? defaultOptions.prefetchContentIndex
- const contentIndexPath = baseDir + "/static/contentIndex.json"
- const contentIndexScript = `const fetchData = fetch(\`${contentIndexPath}\`).then(data => data.json())`
-
return <head>
<title>{title}</title>
<meta charSet="utf-8" />
@@ -36,9 +24,8 @@
<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" />
- {prefetchContentIndex && <script spa-preserve>{contentIndexScript}</script>}
+ <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(res => JSResourceToScriptElement(res, true))}
</head>
--
Gitblit v1.10.0