From d613a3d2f2f1cfa77bdc592c17882e260e2cea17 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 21:13:09 +0000
Subject: [PATCH] chore(deps): bump unified from 11.0.4 to 11.0.5 (#1373)
---
quartz/plugins/emitters/aliases.ts | 64 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/quartz/plugins/emitters/aliases.ts b/quartz/plugins/emitters/aliases.ts
index 84ace74..af3578e 100644
--- a/quartz/plugins/emitters/aliases.ts
+++ b/quartz/plugins/emitters/aliases.ts
@@ -1,32 +1,62 @@
-import { CanonicalSlug, FilePath, ServerSlug, canonicalizeServer, resolveRelative } from "../../path"
+import { FilePath, FullSlug, joinSegments, resolveRelative, simplifySlug } from "../../util/path"
import { QuartzEmitterPlugin } from "../types"
-import path from 'path'
+import path from "path"
+import { write } from "./helpers"
+import DepGraph from "../../depgraph"
export const AliasRedirects: QuartzEmitterPlugin = () => ({
name: "AliasRedirects",
getQuartzComponents() {
return []
},
- async emit(contentFolder, _cfg, content, _resources, emit): Promise<FilePath[]> {
+ async getDependencyGraph(ctx, content, _resources) {
+ const graph = new DepGraph<FilePath>()
+
+ 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
+ }
+
+ graph.addEdge(file.data.filePath!, joinSegments(argv.output, slug + ".html") as FilePath)
+ }
+ }
+
+ return graph
+ },
+ async emit(ctx, content, _resources): Promise<FilePath[]> {
+ const { argv } = ctx
const fps: FilePath[] = []
for (const [_tree, file] of content) {
- const ogSlug = canonicalizeServer(file.data.slug!)
- const dir = path.relative(contentFolder, file.dirname ?? contentFolder)
-
- let aliases: CanonicalSlug[] = []
- if (file.data.frontmatter?.aliases) {
- aliases = file.data.frontmatter?.aliases
- } else if (file.data.frontmatter?.alias) {
- aliases = [file.data.frontmatter?.alias]
+ 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 (const alias of aliases) {
- const slug = path.posix.join(dir, alias) as ServerSlug
+ for (let slug of slugs) {
+ // fix any slugs that have trailing slash
+ if (slug.endsWith("/")) {
+ slug = joinSegments(slug, "index") as FullSlug
+ }
- const fp = slug + ".html" as FilePath
- const redirUrl = resolveRelative(canonicalizeServer(slug), ogSlug)
- await emit({
+ const redirUrl = resolveRelative(slug, file.data.slug!)
+ const fp = await write({
+ ctx,
content: `
<!DOCTYPE html>
<html lang="en-us">
@@ -47,5 +77,5 @@
}
}
return fps
- }
+ },
})
--
Gitblit v1.10.0