From b33f13ccaf4ec14a94ee0ee467dda04cf4981d00 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Mon, 01 Jan 2024 22:20:34 +0000
Subject: [PATCH] fix: dont show last page if folder
---
quartz/plugins/emitters/contentPage.tsx | 116 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 56a2a15..338bfae 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,62 +1,72 @@
-import { toJsxRuntime } from "hast-util-to-jsx-runtime"
-import { resolveToRoot } from "../../path"
-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 { 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, pathToRoot } from "../../util/path"
+import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { Content } from "../../components"
+import chalk from "chalk"
-interface Options {
- Head: ComponentType<HeadProps>
-}
-
-export class ContentPage extends QuartzEmitterPlugin {
- name = "ContentPage"
- opts: Options
-
- constructor(opts: Options) {
- super()
- this.opts = opts
+export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultContentPageLayout,
+ pageBody: Content(),
+ ...userOpts,
}
- async emit(content: ProcessedContent[], resources: StaticResources, emit: EmitCallback): Promise<string[]> {
- const fps: string[] = []
- for (const [tree, file] of content) {
+ const { head: Head, header, beforeBody, pageBody, left, right, footer: Footer } = opts
+ const Header = HeaderConstructor()
+ const Body = BodyConstructor()
- // @ts-ignore (preact makes it angry)
- const content = toJsxRuntime(tree, { Fragment, jsx, jsxs, elementAttributeNameCase: 'html' })
+ return {
+ name: "ContentPage",
+ getQuartzComponents() {
+ return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
+ },
+ async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ const cfg = ctx.cfg.configuration
+ const fps: FilePath[] = []
+ const allFiles = content.map((c) => c[1].data)
- const { Head } = this.opts
- const doc = <html>
- <Head
- title={file.data.frontmatter?.title ?? "Untitled"}
- description={file.data.description ?? "No description provided"}
- slug={file.data.slug!}
- externalResources={resources} />
- <body>
- <div id="quartz-root">
- <header>
- <h1>{file.data.frontmatter?.title}</h1>
- </header>
- <article>
- {content}
- </article>
- </div>
- </body>
- {resources.js.filter(resource => resource.loadTime === "afterDOMReady").map(resource => <script key={resource.src} src={resource.src} />)}
- </html>
+ let containsIndex = false
+ for (const [tree, file] of content) {
+ const slug = file.data.slug!
+ if (slug === "index") {
+ containsIndex = true
+ }
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
- slug: file.data.slug!,
- ext: ".html",
- })
+ const externalResources = pageResources(pathToRoot(slug), resources)
+ const componentData: QuartzComponentProps = {
+ fileData: file.data,
+ externalResources,
+ cfg,
+ children: [],
+ tree,
+ allFiles,
+ }
- fps.push(fp)
- }
- return fps
+ const content = renderPage(slug, componentData, opts, externalResources)
+ const fp = await emit({
+ content,
+ slug,
+ ext: ".html",
+ })
+
+ fps.push(fp)
+ }
+
+ if (!containsIndex) {
+ console.log(
+ chalk.yellow(
+ `\nWarning: you seem to be missing an \`index.md\` home page file at the root of your \`${ctx.argv.directory}\` folder. This may cause errors when deploying.`,
+ ),
+ )
+ }
+
+ return fps
+ },
}
}
--
Gitblit v1.10.0