From e277ed5c307cd263b0f07dfece45946c3fe195d9 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 28 Dec 2023 16:54:09 +0000
Subject: [PATCH] fix: use joinSegment instead of joining via slash in sitemap (closes #658)
---
quartz/plugins/transformers/lastmod.ts | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/quartz/plugins/transformers/lastmod.ts b/quartz/plugins/transformers/lastmod.ts
index 507b585..feca4b5 100644
--- a/quartz/plugins/transformers/lastmod.ts
+++ b/quartz/plugins/transformers/lastmod.ts
@@ -2,6 +2,7 @@
import path from "path"
import { Repository } from "@napi-rs/simple-git"
import { QuartzTransformerPlugin } from "../types"
+import chalk from "chalk"
export interface Options {
priority: ("frontmatter" | "git" | "filesystem")[]
@@ -11,6 +12,20 @@
priority: ["frontmatter", "git", "filesystem"],
}
+function coerceDate(fp: string, d: any): Date {
+ const dt = new Date(d)
+ const invalidDate = isNaN(dt.getTime()) || dt.getTime() === 0
+ if (invalidDate && d !== undefined) {
+ console.log(
+ chalk.yellow(
+ `\nWarning: found invalid date "${d}" in \`${fp}\`. Supported formats: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#date_time_string_format`,
+ ),
+ )
+ }
+
+ return invalidDate ? new Date() : dt
+}
+
type MaybeDate = undefined | string | number
export const CreatedModifiedDate: QuartzTransformerPlugin<Partial<Options> | undefined> = (
userOpts,
@@ -27,10 +42,11 @@
let modified: MaybeDate = undefined
let published: MaybeDate = undefined
- const fp = path.posix.join(file.cwd, file.data.filePath as string)
+ const fp = file.data.filePath!
+ const fullFp = path.posix.join(file.cwd, fp)
for (const source of opts.priority) {
if (source === "filesystem") {
- const st = await fs.promises.stat(fp)
+ const st = await fs.promises.stat(fullFp)
created ||= st.birthtimeMs
modified ||= st.mtimeMs
} else if (source === "frontmatter" && file.data.frontmatter) {
@@ -49,9 +65,9 @@
}
file.data.dates = {
- created: created ? new Date(created) : new Date(),
- modified: modified ? new Date(modified) : new Date(),
- published: published ? new Date(published) : new Date(),
+ created: coerceDate(fp, created),
+ modified: coerceDate(fp, modified),
+ published: coerceDate(fp, published),
}
}
},
--
Gitblit v1.10.0