From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/plugins/emitters/aliases.ts | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index cf99d29..210715e 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,10 +1,4 @@
-import {
- CanonicalSlug,
- FilePath,
- ServerSlug,
- canonicalizeServer,
- resolveRelative,
-} from "../../path"
+import { FilePath, FullSlug, joinSegments, resolveRelative, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
import path from "path"
@@ -17,20 +11,27 @@
const fps: FilePath[] = []
for (const [_tree, file] of content) {
- const ogSlug = canonicalizeServer(file.data.slug!)
- const dir = path.posix.relative(argv.directory, file.dirname ?? argv.directory)
+ const ogSlug = simplifySlug(file.data.slug!)
+ const dir = path.posix.relative(argv.directory, path.dirname(file.data.filePath!))
- let aliases: CanonicalSlug[] = []
- if (file.data.frontmatter?.aliases) {
- aliases = file.data.frontmatter?.aliases
- } else if (file.data.frontmatter?.alias) {
- aliases = [file.data.frontmatter?.alias]
+ let aliases: FullSlug[] = file.data.frontmatter?.aliases ?? file.data.frontmatter?.alias ?? []
+ if (typeof aliases === "string") {
+ aliases = [aliases]
}
- for (const alias of aliases) {
- const slug = path.posix.join(dir, alias) as ServerSlug
+ const slugs: FullSlug[] = aliases.map((alias) => path.posix.join(dir, alias) as FullSlug)
+ const permalink = file.data.frontmatter?.permalink
+ if (typeof permalink === "string") {
+ slugs.push(permalink as FullSlug)
+ }
- const redirUrl = resolveRelative(canonicalizeServer(slug), ogSlug)
+ for (let slug of slugs) {
+ // fix any slugs that have trailing slash
+ if (slug.endsWith("/")) {
+ slug = joinSegments(slug, "index") as FullSlug
+ }
+
+ const redirUrl = resolveRelative(slug, file.data.slug!)
const fp = await emit({
content: `
<!DOCTYPE html>
--
Gitblit v1.10.0