From 771110a72ae005da42169da261f8b8513c9421db Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 18 Mar 2025 08:56:06 -0700 Subject: [PATCH] fix(git): deprioritize git, dont fail on non-git content folders --- quartz.config.ts | 2 +- quartz/plugins/transformers/lastmod.ts | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/quartz.config.ts b/quartz.config.ts index 03ef0d7..195f521 100644 --- a/quartz.config.ts +++ b/quartz.config.ts @@ -57,7 +57,7 @@ const config: QuartzConfig = { transformers: [ Plugin.FrontMatter(), Plugin.CreatedModifiedDate({ - priority: ["git", "frontmatter", "filesystem"], + priority: ["frontmatter", "git", "filesystem"], }), Plugin.SyntaxHighlighting({ theme: { diff --git a/quartz/plugins/transformers/lastmod.ts b/quartz/plugins/transformers/lastmod.ts index aeabad1..e17d894 100644 --- a/quartz/plugins/transformers/lastmod.ts +++ b/quartz/plugins/transformers/lastmod.ts @@ -35,13 +35,23 @@ export const CreatedModifiedDate: QuartzTransformerPlugin> = (u return [ () => { let repo: Repository | undefined = undefined + if (opts.priority.includes("git")) { + try { + repo = Repository.discover(ctx.argv.directory) + } catch (e) { + console.log( + chalk.yellow(`\nWarning: couldn't find git repository for ${ctx.argv.directory}`), + ) + } + } + return async (_tree, file) => { let created: MaybeDate = undefined let modified: MaybeDate = undefined let published: MaybeDate = undefined const fp = file.data.relativePath! - const fullFp = path.posix.join(ctx.argv.directory, fp) + const fullFp = file.data.filePath! for (const source of opts.priority) { if (source === "filesystem") { const st = await fs.promises.stat(fullFp) @@ -51,21 +61,13 @@ export const CreatedModifiedDate: QuartzTransformerPlugin> = (u created ||= file.data.frontmatter.created as MaybeDate modified ||= file.data.frontmatter.modified as MaybeDate published ||= file.data.frontmatter.published as MaybeDate - } else if (source === "git") { - if (!repo) { - // 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(ctx.argv.directory) - } - + } else if (source === "git" && repo) { try { modified ||= await repo.getFileLatestModifiedDateAsync(fullFp) } catch { console.log( chalk.yellow( - `\nWarning: ${file.data - .filePath!} isn't yet tracked by git, last modification date is not available for this file`, + `\nWarning: ${file.data.filePath!} isn't yet tracked by git, dates will be inaccurate`, ), ) }