From e82ba97a396e4e9d77486b48e6ee8b1dfd1c1b4c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 24 Jul 2023 07:07:58 +0000
Subject: [PATCH] actually add processed tag to frontmatter
---
quartz/plugins/emitters/contentPage.tsx | 86 +++++++++++--------------------------------
1 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 03bc0ff..97198da 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,90 +1,48 @@
-import { JSResourceToScriptElement, StaticResources } from "../../resources"
import { QuartzEmitterPlugin } from "../types"
-import { render } from "preact-render-to-string"
-import { QuartzComponent } from "../../components/types"
-import { resolveToRoot, trimPathSuffix } from "../../path"
-import HeaderConstructor from "../../components/Header"
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, canonicalizeServer } from "../../path"
-interface Options {
- head: QuartzComponent
- header: QuartzComponent[],
- beforeBody: QuartzComponent[],
- content: QuartzComponent,
- left: QuartzComponent[],
- right: QuartzComponent[],
- footer: QuartzComponent[],
-}
-
-export const ContentPage: QuartzEmitterPlugin<Options> = (opts) => {
+export const ContentPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
if (!opts) {
- throw new Error("ContentPage must be initialized with options specifiying the components to use")
+ throw new Error(
+ "ContentPage must be initialized with options specifiying the components to use",
+ )
}
- const { head: Head, header, beforeBody, left, right, footer } = opts
+ const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
const Header = HeaderConstructor()
const Body = BodyConstructor()
return {
name: "ContentPage",
getQuartzComponents() {
- return [opts.head, Header, Body, ...opts.header, ...opts.beforeBody, opts.content, ...opts.left, ...opts.right, ...opts.footer]
+ return [Head, Header, Body, ...header, ...beforeBody, Content, ...left, ...right, Footer]
},
- async emit(_contentDir, cfg, content, resources, emit): Promise<string[]> {
- const fps: string[] = []
- const allFiles = content.map(c => c[1].data)
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ const cfg = ctx.cfg.configuration
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
for (const [tree, file] of content) {
- const baseDir = resolveToRoot(file.data.slug!)
- const pageResources: StaticResources = {
- css: [baseDir + "/index.css", ...resources.css],
- js: [
- { src: baseDir + "/prescript.js", loadTime: "beforeDOMReady", contentType: "external" },
- ...resources.js,
- { src: baseDir + "/postscript.js", loadTime: "afterDOMReady", moduleType: 'module', contentType: "external" }
- ]
- }
-
+ const slug = canonicalizeServer(file.data.slug!)
+ const externalResources = pageResources(slug, resources)
const componentData: QuartzComponentProps = {
fileData: file.data,
- externalResources: pageResources,
+ externalResources,
cfg,
children: [],
tree,
- allFiles
+ allFiles,
}
- const Content = opts.content
- const doc = <html>
- <Head {...componentData} />
- <body data-slug={file.data.slug ?? ""}>
- <div id="quartz-root" class="page">
- <Header {...componentData} >
- {header.map(HeaderComponent => <HeaderComponent {...componentData} />)}
- </Header>
- <div class="popover-hint">
- {beforeBody.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
- <Body {...componentData}>
- <div class="left">
- {left.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
- <div class="center popover-hint">
- <Content {...componentData} />
- </div>
- <div class="right">
- {right.map(BodyComponent => <BodyComponent {...componentData} />)}
- </div>
- </Body>
+ const content = renderPage(slug, componentData, opts, externalResources)
- </div>
- </body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
- </html>
-
- const fp = file.data.slug + ".html"
+ const fp = (file.data.slug + ".html") as FilePath
await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
+ content,
slug: file.data.slug!,
ext: ".html",
})
@@ -92,6 +50,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0