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/contentIndex.ts |   88 +++++++++++++++++++++++++------------------
 1 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/quartz/plugins/emitters/contentIndex.ts b/quartz/plugins/emitters/contentIndex.ts
index c9ad0a4..85cdfe7 100644
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@@ -1,16 +1,22 @@
 import { GlobalConfiguration } from "../../cfg"
-import { CanonicalSlug, ClientSlug, FilePath, ServerSlug, canonicalizeServer } from "../../path"
+import {
+  CanonicalSlug,
+  ClientSlug,
+  FilePath,
+  ServerSlug,
+  canonicalizeServer,
+} from "../../util/path"
 import { QuartzEmitterPlugin } from "../types"
 import path from "path"
 
 export type ContentIndex = Map<CanonicalSlug, ContentDetails>
 export type ContentDetails = {
-  title: string,
-  links: CanonicalSlug[],
-  tags: string[],
-  content: string,
-  date?: Date,
-  description?: string,
+  title: string
+  links: CanonicalSlug[]
+  tags: string[]
+  content: string
+  date?: Date
+  description?: string
 }
 
 interface Options {
@@ -31,7 +37,9 @@
     <loc>https://${base}/${slug}</loc>
     <lastmod>${content.date?.toISOString()}</lastmod>
   </url>`
-  const urls = Array.from(idx).map(([slug, content]) => createURLEntry(slug, content)).join("")
+  const urls = Array.from(idx)
+    .map(([slug, content]) => createURLEntry(slug, content))
+    .join("")
   return `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">${urls}</urlset>`
 }
 
@@ -47,7 +55,9 @@
     <pubDate>${content.date?.toUTCString()}</pubDate>
   </items>`
 
-  const items = Array.from(idx).map(([slug, content]) => createURLEntry(slug, content)).join("")
+  const items = Array.from(idx)
+    .map(([slug, content]) => createURLEntry(slug, content))
+    .join("")
   return `<rss xmlns:atom="http://www.w3.org/2005/atom" version="2.0">
     <channel>
       <title>${cfg.pageTitle}</title>
@@ -64,40 +74,43 @@
   opts = { ...defaultOptions, ...opts }
   return {
     name: "ContentIndex",
-    async emit(_contentDir, cfg, content, _resources, emit) {
+    async emit(ctx, content, _resources, emit) {
+      const cfg = ctx.cfg.configuration
       const emitted: FilePath[] = []
       const linkIndex: ContentIndex = new Map()
       for (const [_tree, file] of content) {
         const slug = canonicalizeServer(file.data.slug!)
         const date = file.data.dates?.modified ?? new Date()
         if (opts?.includeEmptyFiles || (file.data.text && file.data.text !== "")) {
-        linkIndex.set(slug, {
-          title: file.data.frontmatter?.title!,
-          links: file.data.links ?? [],
-          tags: file.data.frontmatter?.tags ?? [],
-          content: file.data.text ?? "",
-          date: date,
-          description: file.data.description ?? ""
-        })
+          linkIndex.set(slug, {
+            title: file.data.frontmatter?.title!,
+            links: file.data.links ?? [],
+            tags: file.data.frontmatter?.tags ?? [],
+            content: file.data.text ?? "",
+            date: date,
+            description: file.data.description ?? "",
+          })
         }
       }
 
       if (opts?.enableSiteMap) {
-        await emit({
-          content: generateSiteMap(cfg, linkIndex),
-          slug: "sitemap" as ServerSlug,
-          ext: ".xml"
-        })
-        emitted.push("sitemap.xml" as FilePath)
+        emitted.push(
+          await emit({
+            content: generateSiteMap(cfg, linkIndex),
+            slug: "sitemap" as ServerSlug,
+            ext: ".xml",
+          }),
+        )
       }
 
       if (opts?.enableRSS) {
-        await emit({
-          content: generateRSSFeed(cfg, linkIndex),
-          slug: "index" as ServerSlug,
-          ext: ".xml"
-        })
-        emitted.push("index.xml" as FilePath)
+        emitted.push(
+          await emit({
+            content: generateRSSFeed(cfg, linkIndex),
+            slug: "index" as ServerSlug,
+            ext: ".xml",
+          }),
+        )
       }
 
       const fp = path.join("static", "contentIndex") as ServerSlug
@@ -109,15 +122,16 @@
           delete content.description
           delete content.date
           return [slug, content]
-        })
+        }),
       )
 
-      await emit({
-        content: JSON.stringify(simplifiedIndex),
-        slug: fp,
-        ext: ".json",
-      })
-      emitted.push(`${fp}.json` as FilePath)
+      emitted.push(
+        await emit({
+          content: JSON.stringify(simplifiedIndex),
+          slug: fp,
+          ext: ".json",
+        }),
+      )
 
       return emitted
     },

--
Gitblit v1.10.0