From 29c533a265a380feb2877624cbbb8bff4ad66d34 Mon Sep 17 00:00:00 2001
From: Anton Bulakh <him@necauq.ua>
Date: Tue, 25 Feb 2025 21:28:16 +0000
Subject: [PATCH] fix(aliases): wikilink resolution for aliases (#1681)
---
quartz/plugins/emitters/aliases.ts | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index af3578e..b5bfff0 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,8 +1,8 @@
-import { FilePath, FullSlug, joinSegments, resolveRelative, simplifySlug } from "../../util/path"
+import { FilePath, joinSegments, resolveRelative, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
-import path from "path"
import { write } from "./helpers"
import DepGraph from "../../depgraph"
+import { getAliasSlugs } from "../transformers/frontmatter"
export const AliasRedirects: QuartzEmitterPlugin = () => ({
name: "AliasRedirects",
@@ -14,20 +14,7 @@
const { argv } = ctx
for (const [_tree, file] of content) {
- const dir = path.posix.relative(argv.directory, path.dirname(file.data.filePath!))
- const aliases = file.data.frontmatter?.aliases ?? []
- const slugs = 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)
- }
-
- for (let slug of slugs) {
- // fix any slugs that have trailing slash
- if (slug.endsWith("/")) {
- slug = joinSegments(slug, "index") as FullSlug
- }
-
+ for (const slug of getAliasSlugs(file.data.frontmatter?.aliases ?? [], argv, file)) {
graph.addEdge(file.data.filePath!, joinSegments(argv.output, slug + ".html") as FilePath)
}
}
@@ -40,20 +27,8 @@
for (const [_tree, file] of content) {
const ogSlug = simplifySlug(file.data.slug!)
- const dir = path.posix.relative(argv.directory, path.dirname(file.data.filePath!))
- const aliases = file.data.frontmatter?.aliases ?? []
- 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)
- }
- for (let slug of slugs) {
- // fix any slugs that have trailing slash
- if (slug.endsWith("/")) {
- slug = joinSegments(slug, "index") as FullSlug
- }
-
+ for (const slug of file.data.aliases ?? []) {
const redirUrl = resolveRelative(slug, file.data.slug!)
const fp = await write({
ctx,
--
Gitblit v1.10.0