From 78f4cdbe109308fa33cb87387952aef5a528ebbe Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 19 Aug 2023 23:40:02 +0000
Subject: [PATCH] avoid 404 on icon for spa navigations with anchors
---
quartz/plugins/emitters/aliases.ts | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index 84ace74..62879f7 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,20 +1,20 @@
-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, file.dirname ?? argv.directory)
- let aliases: CanonicalSlug[] = []
+ let aliases: FullSlug[] = []
if (file.data.frontmatter?.aliases) {
aliases = file.data.frontmatter?.aliases
} else if (file.data.frontmatter?.alias) {
@@ -22,11 +22,9 @@
}
for (const alias of aliases) {
- const slug = path.posix.join(dir, alias) as ServerSlug
-
- const fp = slug + ".html" as FilePath
- const redirUrl = resolveRelative(canonicalizeServer(slug), ogSlug)
- await emit({
+ const slug = path.posix.join(dir, alias) as FullSlug
+ const redirUrl = resolveRelative(slug, file.data.slug!)
+ const fp = await emit({
content: `
<!DOCTYPE html>
<html lang="en-us">
@@ -47,5 +45,5 @@
}
}
return fps
- }
+ },
})
--
Gitblit v1.10.0