From 5fa6fc97899c905b6fbc14fa1d24334f3e68fa77 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Tue, 29 Aug 2023 17:37:00 +0000
Subject: [PATCH] fix: aliasredirects not using full path, add permalink support
---
quartz/plugins/emitters/aliases.ts | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index 84ace74..942412e 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,32 +1,33 @@
-import { CanonicalSlug, FilePath, ServerSlug, canonicalizeServer, resolveRelative } from "../../path"
+import { FilePath, FullSlug, resolveRelative, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
-import path from 'path'
+import path from "path"
export const AliasRedirects: QuartzEmitterPlugin = () => ({
name: "AliasRedirects",
getQuartzComponents() {
return []
},
- async emit(contentFolder, _cfg, content, _resources, emit): Promise<FilePath[]> {
+ async emit({ argv }, content, _resources, emit): Promise<FilePath[]> {
const fps: FilePath[] = []
for (const [_tree, file] of content) {
- const ogSlug = canonicalizeServer(file.data.slug!)
- const dir = path.relative(contentFolder, file.dirname ?? contentFolder)
+ 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 fp = slug + ".html" as FilePath
- const redirUrl = resolveRelative(canonicalizeServer(slug), ogSlug)
- await emit({
+ for (const slug of slugs) {
+ const redirUrl = resolveRelative(slug, file.data.slug!)
+ const fp = await emit({
content: `
<!DOCTYPE html>
<html lang="en-us">
@@ -47,5 +48,5 @@
}
}
return fps
- }
+ },
})
--
Gitblit v1.10.0