From c0b73ddaa40576bc391ce9bba0eea922a9a84524 Mon Sep 17 00:00:00 2001 From: Yes365 Date: Mon, 17 Mar 2025 23:27:15 +0800 Subject: [PATCH 1/4] fix: maybeDates will change children dates (#1843) --- quartz/components/pages/FolderContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quartz/components/pages/FolderContent.tsx b/quartz/components/pages/FolderContent.tsx index e77565312..9621f4f1a 100644 --- a/quartz/components/pages/FolderContent.tsx +++ b/quartz/components/pages/FolderContent.tsx @@ -71,7 +71,7 @@ export default ((opts?: Partial) => { if (child.data?.dates) { // compare all dates and assign to maybeDates if its more recent or its not set if (!maybeDates) { - maybeDates = child.data.dates + maybeDates = { ...child.data.dates } } else { if (child.data.dates.created > maybeDates.created) { maybeDates.created = child.data.dates.created From dc6a9f3b1269b30b94faae7b21b6f02804f7fedb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Mar 2025 14:49:27 -0700 Subject: [PATCH 2/4] chore(deps): bump rlespinasse/github-slug-action (#1851) Bumps the ci-dependencies group with 1 update: [rlespinasse/github-slug-action](https://github.com/rlespinasse/github-slug-action). Updates `rlespinasse/github-slug-action` from 5.0.0 to 5.1.0 - [Release notes](https://github.com/rlespinasse/github-slug-action/releases) - [Commits](https://github.com/rlespinasse/github-slug-action/compare/v5.0.0...v5.1.0) --- updated-dependencies: - dependency-name: rlespinasse/github-slug-action dependency-type: direct:production update-type: version-update:semver-minor dependency-group: ci-dependencies ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker-build-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push.yaml b/.github/workflows/docker-build-push.yaml index 5116a73c6..af79eada7 100644 --- a/.github/workflows/docker-build-push.yaml +++ b/.github/workflows/docker-build-push.yaml @@ -25,7 +25,7 @@ jobs: with: fetch-depth: 1 - name: Inject slug/short variables - uses: rlespinasse/github-slug-action@v5.0.0 + uses: rlespinasse/github-slug-action@v5.1.0 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From 771110a72ae005da42169da261f8b8513c9421db Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 18 Mar 2025 08:56:06 -0700 Subject: [PATCH 3/4] 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 03ef0d7f8..195f521dc 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 aeabad19e..e17d894b0 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`, ), ) } From 9818e1ad5788906162fca5e62665ac21ef0d9639 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Tue, 18 Mar 2025 09:00:15 -0700 Subject: [PATCH 4/4] chore: remove unused import --- quartz/plugins/transformers/lastmod.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/quartz/plugins/transformers/lastmod.ts b/quartz/plugins/transformers/lastmod.ts index e17d894b0..09c12941f 100644 --- a/quartz/plugins/transformers/lastmod.ts +++ b/quartz/plugins/transformers/lastmod.ts @@ -1,5 +1,4 @@ import fs from "fs" -import path from "path" import { Repository } from "@napi-rs/simple-git" import { QuartzTransformerPlugin } from "../types" import chalk from "chalk"