From b99d4cd8ce99ea1e52a97654ab153774a6bc598a Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 20 Aug 2023 21:05:37 +0000
Subject: [PATCH] recent notes css fixes
---
quartz/plugins/emitters/contentIndex.ts | 56 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/quartz/plugins/emitters/contentIndex.ts b/quartz/plugins/emitters/contentIndex.ts
index a94b552..f4bf6db 100644
--- a/quartz/plugins/emitters/contentIndex.ts
+++ b/quartz/plugins/emitters/contentIndex.ts
@@ -1,12 +1,12 @@
import { GlobalConfiguration } from "../../cfg"
-import { CanonicalSlug, ClientSlug, FilePath, ServerSlug, canonicalizeServer } from "../../path"
+import { FilePath, FullSlug, SimpleSlug, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
import path from "path"
-export type ContentIndex = Map<CanonicalSlug, ContentDetails>
+export type ContentIndex = Map<FullSlug, ContentDetails>
export type ContentDetails = {
title: string
- links: CanonicalSlug[]
+ links: SimpleSlug[]
tags: string[]
content: string
date?: Date
@@ -27,21 +27,21 @@
function generateSiteMap(cfg: GlobalConfiguration, idx: ContentIndex): string {
const base = cfg.baseUrl ?? ""
- const createURLEntry = (slug: CanonicalSlug, content: ContentDetails): string => `<url>
+ const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<url>
<loc>https://${base}/${slug}</loc>
<lastmod>${content.date?.toISOString()}</lastmod>
</url>`
const urls = Array.from(idx)
- .map(([slug, content]) => createURLEntry(slug, content))
+ .map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
.join("")
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 {
const base = cfg.baseUrl ?? ""
- const root = `https://${base}` as ClientSlug
+ const root = `https://${base}`
- const createURLEntry = (slug: CanonicalSlug, content: ContentDetails): string => `<items>
+ const createURLEntry = (slug: SimpleSlug, content: ContentDetails): string => `<items>
<title>${content.title}</title>
<link>${root}/${slug}</link>
<guid>${root}/${slug}</guid>
@@ -50,7 +50,7 @@
</items>`
const items = Array.from(idx)
- .map(([slug, content]) => createURLEntry(slug, content))
+ .map(([slug, content]) => createURLEntry(simplifySlug(slug), content))
.join("")
return `<rss xmlns:atom="http://www.w3.org/2005/atom" version="2.0">
<channel>
@@ -73,7 +73,7 @@
const emitted: FilePath[] = []
const linkIndex: ContentIndex = new Map()
for (const [_tree, file] of content) {
- const slug = canonicalizeServer(file.data.slug!)
+ const slug = file.data.slug!
const date = file.data.dates?.modified ?? new Date()
if (opts?.includeEmptyFiles || (file.data.text && file.data.text !== "")) {
linkIndex.set(slug, {
@@ -88,22 +88,26 @@
}
if (opts?.enableSiteMap) {
- emitted.push(await emit({
- content: generateSiteMap(cfg, linkIndex),
- slug: "sitemap" as ServerSlug,
- ext: ".xml",
- }))
+ emitted.push(
+ await emit({
+ content: generateSiteMap(cfg, linkIndex),
+ slug: "sitemap" as FullSlug,
+ ext: ".xml",
+ }),
+ )
}
if (opts?.enableRSS) {
- emitted.push(await emit({
- content: generateRSSFeed(cfg, linkIndex),
- slug: "index" as ServerSlug,
- ext: ".xml",
- }))
+ emitted.push(
+ await emit({
+ content: generateRSSFeed(cfg, linkIndex),
+ slug: "index" as FullSlug,
+ ext: ".xml",
+ }),
+ )
}
- const fp = path.join("static", "contentIndex") as ServerSlug
+ const fp = path.join("static", "contentIndex") as FullSlug
const simplifiedIndex = Object.fromEntries(
Array.from(linkIndex).map(([slug, content]) => {
// remove description and from content index as nothing downstream
@@ -115,11 +119,13 @@
}),
)
- emitted.push(await emit({
- content: JSON.stringify(simplifiedIndex),
- slug: fp,
- ext: ".json",
- }))
+ emitted.push(
+ await emit({
+ content: JSON.stringify(simplifiedIndex),
+ slug: fp,
+ ext: ".json",
+ }),
+ )
return emitted
},
--
Gitblit v1.10.0