From c4cd84dcc884469a0d84e2bec239b2fc3596c44f Mon Sep 17 00:00:00 2001
From: Andrew <80933354+ndrooo@users.noreply.github.com>
Date: Sat, 24 Aug 2024 17:13:55 +0000
Subject: [PATCH] fix: Add a wrapper element to dates in PageList. (#1345)
---
quartz/plugins/emitters/contentPage.tsx | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index e531b36..2ac1321 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,16 +1,56 @@
+import path from "path"
+import { visit } from "unist-util-visit"
+import { Root } from "hast"
+import { VFile } from "vfile"
import { QuartzEmitterPlugin } from "../types"
import { QuartzComponentProps } from "../../components/types"
import HeaderConstructor from "../../components/Header"
import BodyConstructor from "../../components/Body"
import { pageResources, renderPage } from "../../components/renderPage"
import { FullPageLayout } from "../../cfg"
-import { FilePath, joinSegments, pathToRoot } from "../../util/path"
+import { Argv } from "../../util/ctx"
+import { FilePath, isRelativeURL, joinSegments, pathToRoot } from "../../util/path"
import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
import { Content } from "../../components"
import chalk from "chalk"
import { write } from "./helpers"
import DepGraph from "../../depgraph"
+// get all the dependencies for the markdown file
+// eg. images, scripts, stylesheets, transclusions
+const parseDependencies = (argv: Argv, hast: Root, file: VFile): string[] => {
+ const dependencies: string[] = []
+
+ visit(hast, "element", (elem): void => {
+ let ref: string | null = null
+
+ if (
+ ["script", "img", "audio", "video", "source", "iframe"].includes(elem.tagName) &&
+ elem?.properties?.src
+ ) {
+ ref = elem.properties.src.toString()
+ } else if (["a", "link"].includes(elem.tagName) && elem?.properties?.href) {
+ // transclusions will create a tags with relative hrefs
+ ref = elem.properties.href.toString()
+ }
+
+ // if it is a relative url, its a local file and we need to add
+ // it to the dependency graph. otherwise, ignore
+ if (ref === null || !isRelativeURL(ref)) {
+ return
+ }
+
+ let fp = path.join(file.data.filePath!, path.relative(argv.directory, ref)).replace(/\\/g, "/")
+ // markdown files have the .md extension stripped in hrefs, add it back here
+ if (!fp.split("/").pop()?.includes(".")) {
+ fp += ".md"
+ }
+ dependencies.push(fp)
+ })
+
+ return dependencies
+}
+
export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
const opts: FullPageLayout = {
...sharedPageComponents,
@@ -19,23 +59,37 @@
...userOpts,
}
- const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
+ const { head: Head, header, beforeBody, pageBody, afterBody, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "ContentPage",
getQuartzComponents() {
- return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
+ return [
+ Head,
+ Header,
+ Body,
+ ...header,
+ ...beforeBody,
+ pageBody,
+ ...afterBody,
+ ...left,
+ ...right,
+ Footer,
+ ]
},
async getDependencyGraph(ctx, content, _resources) {
- // TODO handle transclusions
const graph = new DepGraph<FilePath>()
- for (const [_tree, file] of content) {
+ for (const [tree, file] of content) {
const sourcePath = file.data.filePath!
const slug = file.data.slug!
graph.addEdge(sourcePath, joinSegments(ctx.argv.output, slug + ".html") as FilePath)
+
+ parseDependencies(ctx.argv, tree as Root, file).forEach((dep) => {
+ graph.addEdge(dep as FilePath, sourcePath)
+ })
}
return graph
@@ -54,6 +108,7 @@
const externalResources = pageResources(pathToRoot(slug), resources)
const componentData: QuartzComponentProps = {
+ ctx,
fileData: file.data,
externalResources,
cfg,
--
Gitblit v1.10.0