From ae2e3b463a91d94caa8bdf62e5c3a3d726b8b4e4 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 23 Jul 2023 18:49:26 +0000
Subject: [PATCH] improve error handling while serving
---
quartz/plugins/emitters/contentPage.tsx | 112 ++++++++++++++++++++++---------------------------------
1 files changed, 45 insertions(+), 67 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index fa17a7e..59a24f2 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,76 +1,54 @@
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
-import { StaticResources } from "../../resources"
-import { EmitCallback, QuartzEmitterPlugin } from "../types"
-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 { googleFontHref, templateThemeStyles } from "../../theme"
-import { GlobalConfiguration } from "../../cfg"
-import { HeaderProps } from "../../components/Header"
+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, canonicalizeServer } from "../../path"
-import styles from '../../styles/base.scss'
-
-interface Options {
- Head: ComponentType<HeadProps>
- Header: ComponentType<HeaderProps>
-}
-
-export class ContentPage extends QuartzEmitterPlugin {
- name = "ContentPage"
- opts: Options
-
- constructor(opts: Options) {
- super()
- this.opts = opts
+export const ContentPage: QuartzEmitterPlugin<FullPageLayout> = (opts) => {
+ if (!opts) {
+ throw new Error(
+ "ContentPage must be initialized with options specifiying the components to use",
+ )
}
- async emit(cfg: GlobalConfiguration, content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
- const fps: string[] = []
+ const { head: Head, header, beforeBody, pageBody: Content, left, right, footer: Footer } = opts
+ const Header = HeaderConstructor()
+ const Body = BodyConstructor()
- // emit styles
- emit({
- slug: "index",
- ext: ".css",
- content: templateThemeStyles(cfg.theme, styles)
- })
- fps.push("index.css")
- resources.css.push(googleFontHref(cfg.theme))
+ return {
+ name: "ContentPage",
+ getQuartzComponents() {
+ return [Head, Header, Body, ...header, ...beforeBody, Content, ...left, ...right, Footer]
+ },
+ async emit(_contentDir, cfg, content, resources, emit): Promise<FilePath[]> {
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
+ for (const [tree, file] of content) {
+ const slug = canonicalizeServer(file.data.slug!)
+ const externalResources = pageResources(slug, resources)
+ const componentData: QuartzComponentProps = {
+ fileData: file.data,
+ externalResources,
+ cfg,
+ children: [],
+ tree,
+ allFiles,
+ }
- for (const [tree, file] of content) {
- // @ts-ignore (preact makes it angry)
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
+ const content = renderPage(slug, componentData, opts, externalResources)
- const title = file.data.frontmatter?.title
- const { Head, Header } = this.opts
- const doc = <html>
- <Head
- title={title ?? "Untitled"}
- description={file.data.description ?? "No description provided"}
- slug={file.data.slug!}
- externalResources={resources} />
- <body>
- <div id="quartz-root" class="page">
- <Header title={cfg.siteTitle} slug={file.data.slug!} />
- <article>
- {file.data.slug !== "index" && <h1>{title}</h1>}
- {content}
- </article>
- </div>
- </body>
- {resources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} src={resource.src} />)}
- </html>
+ const fp = (file.data.slug + ".html") as FilePath
+ await emit({
+ content,
+ slug: file.data.slug!,
+ ext: ".html",
+ })
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
- slug: file.data.slug!,
- ext: ".html",
- })
-
- fps.push(fp)
- }
- return fps
+ fps.push(fp)
+ }
+ return fps
+ },
}
}
--
Gitblit v1.10.0