From fea352849c6972da4b3b8935eb2e86f6cefc76ed Mon Sep 17 00:00:00 2001
From: Ben Schlegel <ben5.schlegel@gmail.com>
Date: Sat, 16 Sep 2023 17:45:21 +0000
Subject: [PATCH] fix: create deep copy of file passed into tree
---
quartz/plugins/emitters/contentIndex.ts | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/quartz/plugins/emitters/contentIndex.ts b/quartz/plugins/emitters/contentIndex.ts
index 1d0af6d..911173e 100644
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@@ -1,7 +1,10 @@
+import { Root } from "hast"
import { GlobalConfiguration } from "../../cfg"
import { getDate } from "../../components/Date"
+import { escapeHTML } from "../../util/escape"
import { FilePath, FullSlug, SimpleSlug, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
+import { toHtml } from "hast-util-to-html"
import path from "path"
export type ContentIndex = Map<FullSlug, ContentDetails>
@@ -10,6 +13,7 @@
links: SimpleSlug[]
tags: string[]
content: string
+ richContent?: string
date?: Date
description?: string
}
@@ -17,19 +21,23 @@
interface Options {
enableSiteMap: boolean
enableRSS: boolean
+ rssLimit?: number
+ rssFullHtml: boolean
includeEmptyFiles: boolean
}
const defaultOptions: Options = {
enableSiteMap: true,
enableRSS: true,
+ rssLimit: 10,
+ rssFullHtml: false,
includeEmptyFiles: true,
}
function generateSiteMap(cfg: GlobalConfiguration, idx: ContentIndex): string {
const base = cfg.baseUrl ?? ""
const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<url>
- <loc>https://${base}/${encodeURIComponent(slug)}</loc>
+ <loc>https://${base}/${encodeURI(slug)}</loc>
<lastmod>${content.date?.toISOString()}</lastmod>
</url>`
const urls = Array.from(idx)
@@ -38,27 +46,31 @@
return `<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">${urls}</urlset>`
}
-function generateRSSFeed(cfg: GlobalConfiguration, idx: ContentIndex): string {
+function generateRSSFeed(cfg: GlobalConfiguration, idx: ContentIndex, limit?: number): string {
const base = cfg.baseUrl ?? ""
const root = `https://${base}`
const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<item>
- <title>${content.title}</title>
- <link>${root}/${encodeURIComponent(slug)}</link>
- <guid>${root}/${encodeURIComponent(slug)}</guid>
- <description>${content.description}</description>
+ <title>${escapeHTML(content.title)}</title>
+ <link>${root}/${encodeURI(slug)}</link>
+ <guid>${root}/${encodeURI(slug)}</guid>
+ <description>${content.richContent ?? content.description}</description>
<pubDate>${content.date?.toUTCString()}</pubDate>
</item>`
const items = Array.from(idx)
.map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
+ .slice(0, limit ?? idx.size)
.join("")
+
return `<?xml version="1.0" encoding="UTF-8" ?>
<rss version="2.0">
<channel>
- <title>${cfg.pageTitle}</title>
+ <title>${escapeHTML(cfg.pageTitle)}</title>
<link>${root}</link>
- <description>Recent content on ${cfg.pageTitle}</description>
+ <description>${!!limit ? `Last ${limit} notes` : "Recent notes"} on ${
+ cfg.pageTitle
+ }</description>
<generator>Quartz -- quartz.jzhao.xyz</generator>
${items}
</channel>
@@ -73,7 +85,7 @@
const cfg = ctx.cfg.configuration
const emitted: FilePath[] = []
const linkIndex: ContentIndex = new Map()
- for (const [_tree, file] of content) {
+ for (const [tree, file] of content) {
const slug = file.data.slug!
const date = getDate(ctx.cfg.configuration, file.data) ?? new Date()
if (opts?.includeEmptyFiles || (file.data.text && file.data.text !== "")) {
@@ -82,6 +94,9 @@
links: file.data.links ?? [],
tags: file.data.frontmatter?.tags ?? [],
content: file.data.text ?? "",
+ richContent: opts?.rssFullHtml
+ ? escapeHTML(toHtml(tree as Root, { allowDangerousHtml: true }))
+ : undefined,
date: date,
description: file.data.description ?? "",
})
@@ -101,7 +116,7 @@
if (opts?.enableRSS) {
emitted.push(
await emit({
- content: generateRSSFeed(cfg, linkIndex),
+ content: generateRSSFeed(cfg, linkIndex, opts.rssLimit),
slug: "index" as FullSlug,
ext: ".xml",
}),
--
Gitblit v1.10.0