From 4c904d88aba14d0d153bfac364630ad61832a73d Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 01 Jul 2023 20:35:27 +0000
Subject: [PATCH] rss + sitemap
---
quartz/path.ts | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/quartz/path.ts b/quartz/path.ts
index bece770..4755687 100644
--- a/quartz/path.ts
+++ b/quartz/path.ts
@@ -1,15 +1,20 @@
import path from 'path'
-import SlugAnchor from 'github-slugger'
-
-export const slugAnchor = new SlugAnchor()
+import { slug as slugAnchor } from 'github-slugger'
function slugSegment(s: string): string {
return s.replace(/\s/g, '-')
}
+export function trimPathSuffix(fp: string): string {
+ let [cleanPath, anchor] = fp.split("#", 2)
+ anchor = anchor === undefined ? "" : "#" + anchor
+
+ return cleanPath + anchor
+}
+
export function slugify(s: string): string {
const [fp, anchor] = s.split("#", 2)
- const sluggedAnchor = anchor === undefined ? "" : "#" + slugAnchor.slug(anchor)
+ const sluggedAnchor = anchor === undefined ? "" : "#" + slugAnchor(anchor)
const withoutFileExt = fp.replace(new RegExp(path.extname(fp) + '$'), '')
const rawSlugSegments = withoutFileExt.split(path.sep)
const slugParts: string = rawSlugSegments
@@ -21,7 +26,7 @@
// resolve /a/b/c to ../../
export function resolveToRoot(slug: string): string {
- let fp = slug
+ let fp = trimPathSuffix(slug)
if (fp.endsWith("index")) {
fp = fp.slice(0, -"index".length)
}
@@ -42,7 +47,8 @@
}
export function relative(src: string, dest: string): string {
- return path.relative(src, dest)
+ return "./" + path.relative(src, dest)
+
}
export const QUARTZ = "quartz"
--
Gitblit v1.10.0