From dde36fa5589a362b60b7b72eb7793a3f133e159c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 07 Jun 2023 17:52:53 +0000
Subject: [PATCH] update gh actions
---
quartz/plugins/emitters/contentPage.tsx | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 08d989b..c4b357c 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -4,15 +4,17 @@
import { ProcessedContent } from "../vfile"
import { Fragment, jsx, jsxs } from 'preact/jsx-runtime'
import { render } from "preact-render-to-string"
-import { ComponentType } from "preact"
import { HeadProps } from "../../components/Head"
-
-import styles from '../../styles/base.scss'
-import { googleFontHref, templateThemeStyles } from "../../theme"
import { GlobalConfiguration } from "../../cfg"
+import { HeaderProps } from "../../components/Header"
+import { QuartzComponent } from "../../components/types"
+import { resolveToRoot } from "../../path"
+import { BodyProps } from "../../components/Body"
interface Options {
- Head: ComponentType<HeadProps>
+ Head: QuartzComponent<HeadProps>
+ Header: QuartzComponent<HeaderProps>
+ Body: QuartzComponent<BodyProps>
}
export class ContentPage extends QuartzEmitterPlugin {
@@ -24,41 +26,42 @@
this.opts = opts
}
+ getQuartzComponents(): QuartzComponent<any>[] {
+ return [...Object.values(this.opts)]
+ }
+
async emit(cfg: GlobalConfiguration, content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
const fps: string[] = []
- // emit styles
- emit({
- slug: "index",
- ext: ".css",
- content: templateThemeStyles(cfg.theme, styles)
- })
- fps.push("index.css")
- resources.css.push(googleFontHref(cfg.theme))
-
+ const { Head, Header, Body } = this.opts
for (const [tree, file] of content) {
-
// @ts-ignore (preact makes it angry)
const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
- const { Head } = this.opts
+ const baseDir = resolveToRoot(file.data.slug!)
+ const pageResources: StaticResources = {
+ css: [baseDir + "/index.css", ...resources.css,],
+ js: [
+ { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady" },
+ ...resources.js,
+ { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", type: 'module' }
+ ]
+ }
+
+ const title = file.data.frontmatter?.title
const doc = <html>
<Head
- title={file.data.frontmatter?.title ?? "Untitled"}
+ title={title ?? "Untitled"}
description={file.data.description ?? "No description provided"}
slug={file.data.slug!}
- externalResources={resources} />
+ externalResources={pageResources} />
<body>
<div id="quartz-root" class="page">
- <header>
- <h1>{file.data.frontmatter?.title}</h1>
- </header>
- <article>
- {content}
- </article>
+ <Header title={cfg.siteTitle} slug={file.data.slug!} />
+ <Body title={file.data.slug === "index" ? undefined : title}>{content}</Body>
</div>
</body>
- {resources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} src={resource.src} />)}
+ {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} {...resource} />)}
</html>
const fp = file.data.slug + ".html"
--
Gitblit v1.10.0