From 52ca312f41ee6da5202cd9632d8501340ada3a67 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 27 Aug 2023 19:27:55 +0000
Subject: [PATCH] fix: slugify tag on page before adding (closes #411)
---
quartz/plugins/emitters/aliases.ts | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index 0a992ba..c7294a3 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, resolveRelative, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
import path from "path"
@@ -13,26 +7,22 @@
getQuartzComponents() {
return []
},
- async emit({argv}, 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(argv.directory, file.dirname ?? argv.directory)
+ const ogSlug = simplifySlug(file.data.slug!)
+ const dir = path.posix.relative(argv.directory, file.dirname ?? argv.directory)
- 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 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">
--
Gitblit v1.10.0