From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/plugins/emitters/tagPage.tsx | 67 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 24 deletions(-)
diff --git a/quartz/plugins/emitters/tagPage.tsx b/quartz/plugins/emitters/tagPage.tsx
index 30717fa..de07623 100644
--- a/quartz/plugins/emitters/tagPage.tsx
+++ b/quartz/plugins/emitters/tagPage.tsx
@@ -5,30 +5,56 @@
import { pageResources, renderPage } from "../../components/renderPage"
import { ProcessedContent, defaultProcessedContent } from "../vfile"
import { FullPageLayout } from "../../cfg"
-import { CanonicalSlug, FilePath, ServerSlug } from "../../path"
+import {
+ CanonicalSlug,
+ FilePath,
+ ServerSlug,
+ getAllSegmentPrefixes,
+ joinSegments,
+} from "../../util/path"
+import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { TagContent } from "../../components"
-export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
- if (!opts) {
- throw new Error("TagPage must be initialized with options specifiying the components to use")
+export const TagPage: QuartzEmitterPlugin<FullPageLayout> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultListPageLayout,
+ pageBody: TagContent(),
+ ...userOpts,
}
- const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
+ const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "TagPage",
getQuartzComponents() {
- return [Head, Header, Body, ...header, ...beforeBody, Content, ...left, ...right, Footer]
+ return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<FilePath[]> {
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
const fps: FilePath[] = []
- const allFiles = content.map(c => c[1].data)
+ const allFiles = content.map((c) => c[1].data)
+ const cfg = ctx.cfg.configuration
- const tags: Set<string> = new Set(allFiles.flatMap(data => data.frontmatter?.tags ?? []))
- const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries([...tags].map(tag => ([
- tag, defaultProcessedContent({ slug: `tags/${tag}` as ServerSlug, frontmatter: { title: `Tag: ${tag}`, tags: [] } })
- ])))
+ const tags: Set<string> = new Set(
+ allFiles.flatMap((data) => data.frontmatter?.tags ?? []).flatMap(getAllSegmentPrefixes),
+ )
+ // add base tag
+ tags.add("index")
+
+ const tagDescriptions: Record<string, ProcessedContent> = Object.fromEntries(
+ [...tags].map((tag) => {
+ const title = tag === "" ? "Tag Index" : `Tag: #${tag}`
+ return [
+ tag,
+ defaultProcessedContent({
+ slug: joinSegments("tags", tag) as ServerSlug,
+ frontmatter: { title, tags: [] },
+ }),
+ ]
+ }),
+ )
for (const [tree, file] of content) {
const slug = file.data.slug!
@@ -41,7 +67,7 @@
}
for (const tag of tags) {
- const slug = `tags/${tag}` as CanonicalSlug
+ const slug = joinSegments("tags", tag) as CanonicalSlug
const externalResources = pageResources(slug, resources)
const [tree, file] = tagDescriptions[tag]
const componentData: QuartzComponentProps = {
@@ -50,18 +76,11 @@
cfg,
children: [],
tree,
- allFiles
+ allFiles,
}
- const content = renderPage(
- slug,
- componentData,
- opts,
- externalResources
- )
-
- const fp = file.data.slug + ".html" as FilePath
- await emit({
+ const content = renderPage(slug, componentData, opts, externalResources)
+ const fp = await emit({
content,
slug: file.data.slug!,
ext: ".html",
@@ -70,6 +89,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0