From 94fbf5b0668cc0f4352d433fcb37d621e8aed988 Mon Sep 17 00:00:00 2001
From: RunTheBot <58890327+RunTheBot@users.noreply.github.com>
Date: Wed, 29 May 2024 19:52:53 +0000
Subject: [PATCH] fix: Reorder Unified.js plugins to fix #1132 (#1139)
---
quartz/plugins/transformers/lastmod.ts | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/quartz/plugins/transformers/lastmod.ts b/quartz/plugins/transformers/lastmod.ts
index 507b585..2c7b9ce 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,31 +42,44 @@
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.isAbsolute(fp) ? fp : 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) {
- created ||= file.data.frontmatter.date
- modified ||= file.data.frontmatter.lastmod
- modified ||= file.data.frontmatter.updated
- modified ||= file.data.frontmatter["last-modified"]
- published ||= file.data.frontmatter.publishDate
+ created ||= file.data.frontmatter.date as MaybeDate
+ modified ||= file.data.frontmatter.lastmod as MaybeDate
+ modified ||= file.data.frontmatter.updated as MaybeDate
+ modified ||= file.data.frontmatter["last-modified"] as MaybeDate
+ published ||= file.data.frontmatter.publishDate as MaybeDate
} else if (source === "git") {
if (!repo) {
- repo = new Repository(file.cwd)
+ // Get a reference to the main git repo.
+ // It's either the same as the workdir,
+ // or 1+ level higher in case of a submodule/subtree setup
+ repo = Repository.discover(file.cwd)
}
- modified ||= await repo.getFileLatestModifiedDateAsync(file.data.filePath!)
+ try {
+ modified ||= await repo.getFileLatestModifiedDateAsync(file.data.filePath!)
+ } catch {
+ console.log(
+ chalk.yellow(
+ `\nWarning: ${file.data
+ .filePath!} isn't yet tracked by git, last modification date is not available for this file`,
+ ),
+ )
+ }
}
}
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