From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/plugins/emitters/aliases.ts | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index c9a019b..1fbea76 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,20 +1,26 @@
-import { relativeToRoot } from "../../path"
+import {
+ CanonicalSlug,
+ FilePath,
+ ServerSlug,
+ canonicalizeServer,
+ resolveRelative,
+} 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<string[]> {
- const fps: string[] = []
+ async emit({ argv }, content, _resources, emit): Promise<FilePath[]> {
+ const fps: FilePath[] = []
for (const [_tree, file] of content) {
- const ogSlug = file.data.slug!
- const dir = path.relative(contentFolder, file.dirname ?? contentFolder)
+ const ogSlug = canonicalizeServer(file.data.slug!)
+ const dir = path.posix.relative(argv.directory, file.dirname ?? argv.directory)
- let aliases: string[] = []
+ let aliases: CanonicalSlug[] = []
if (file.data.frontmatter?.aliases) {
aliases = file.data.frontmatter?.aliases
} else if (file.data.frontmatter?.alias) {
@@ -22,13 +28,10 @@
}
for (const alias of aliases) {
- const slug = alias.startsWith("/")
- ? alias
- : path.posix.join(dir, alias)
+ const slug = path.posix.join(dir, alias) as ServerSlug
- const fp = slug + ".html"
- const redirUrl = relativeToRoot(slug, ogSlug)
- await emit({
+ const redirUrl = resolveRelative(canonicalizeServer(slug), ogSlug)
+ const fp = await emit({
content: `
<!DOCTYPE html>
<html lang="en-us">
@@ -49,5 +52,5 @@
}
}
return fps
- }
+ },
})
--
Gitblit v1.10.0