From ec00a40aefca73596ab76e3ebe3a8e1129b43688 Mon Sep 17 00:00:00 2001
From: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jan 2026 18:27:17 +0000
Subject: [PATCH] chore(deps): bump the production-dependencies group with 4 updates (#2289)
---
quartz/plugins/emitters/contentPage.tsx | 180 ++++++++++++++++++++++++++++++++++--------------------------
1 files changed, 102 insertions(+), 78 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index 03bc0ff..c3410ec 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -1,97 +1,121 @@
-import { JSResourceToScriptElement, StaticResources } from "../../resources"
+import path from "path"
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 { pathToRoot } from "../../util/path"
+import { defaultContentPageLayout, sharedPageComponents } from "../../../quartz.layout"
+import { Content } from "../../components"
+import { styleText } from "util"
+import { write } from "./helpers"
+import { BuildCtx } from "../../util/ctx"
+import { Node } from "unist"
+import { StaticResources } from "../../util/resources"
+import { QuartzPluginData } from "../vfile"
-interface Options {
- head: QuartzComponent
- header: QuartzComponent[],
- beforeBody: QuartzComponent[],
- content: QuartzComponent,
- left: QuartzComponent[],
- right: QuartzComponent[],
- footer: QuartzComponent[],
-}
-
-export const ContentPage: QuartzEmitterPlugin<Options> = (opts) => {
- if (!opts) {
- throw new Error("ContentPage must be initialized with options specifiying the components to use")
+async function processContent(
+ ctx: BuildCtx,
+ tree: Node,
+ fileData: QuartzPluginData,
+ allFiles: QuartzPluginData[],
+ opts: FullPageLayout,
+ resources: StaticResources,
+) {
+ const slug = fileData.slug!
+ const cfg = ctx.cfg.configuration
+ const externalResources = pageResources(pathToRoot(slug), resources)
+ const componentData: QuartzComponentProps = {
+ ctx,
+ fileData,
+ externalResources,
+ cfg,
+ children: [],
+ tree,
+ allFiles,
}
- const { head: Head, header, beforeBody, left, right, footer } = opts
+ const content = renderPage(cfg, slug, componentData, opts, externalResources)
+ return write({
+ ctx,
+ content,
+ slug,
+ ext: ".html",
+ })
+}
+
+export const ContentPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
+ const opts: FullPageLayout = {
+ ...sharedPageComponents,
+ ...defaultContentPageLayout,
+ pageBody: Content(),
+ ...userOpts,
+ }
+
+ const { head: Head, header, beforeBody, pageBody, afterBody, 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,
+ pageBody,
+ ...afterBody,
+ ...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) {
+ const allFiles = content.map((c) => c[1].data)
+ let containsIndex = false
+
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 = file.data.slug!
+ if (slug === "index") {
+ containsIndex = true
}
- const componentData: QuartzComponentProps = {
- fileData: file.data,
- externalResources: pageResources,
- cfg,
- children: [],
- tree,
- 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>
-
- </div>
- </body>
- {pageResources.js.filter(resource => resource.loadTime === "afterDOMReady").map(res => JSResourceToScriptElement(res))}
- </html>
-
- const fp = file.data.slug + ".html"
- await emit({
- content: "<!DOCTYPE html>\n" + render(doc),
- slug: file.data.slug!,
- ext: ".html",
- })
-
- fps.push(fp)
+ // only process home page, non-tag pages, and non-index pages
+ if (slug.endsWith("/index") || slug.startsWith("tags/")) continue
+ yield processContent(ctx, tree, file.data, allFiles, opts, resources)
}
- return fps
- }
+
+ if (!containsIndex) {
+ console.log(
+ styleText(
+ "yellow",
+ `\nWarning: you seem to be missing an \`index.md\` home page file at the root of your \`${ctx.argv.directory}\` folder (\`${path.join(ctx.argv.directory, "index.md")} does not exist\`). This may cause errors when deploying.`,
+ ),
+ )
+ }
+ },
+ async *partialEmit(ctx, content, resources, changeEvents) {
+ const allFiles = content.map((c) => c[1].data)
+
+ // find all slugs that changed or were added
+ const changedSlugs = new Set<string>()
+ for (const changeEvent of changeEvents) {
+ if (!changeEvent.file) continue
+ if (changeEvent.type === "add" || changeEvent.type === "change") {
+ changedSlugs.add(changeEvent.file.data.slug!)
+ }
+ }
+
+ for (const [tree, file] of content) {
+ const slug = file.data.slug!
+ if (!changedSlugs.has(slug)) continue
+ if (slug.endsWith("/index") || slug.startsWith("tags/")) continue
+
+ yield processContent(ctx, tree, file.data, allFiles, opts, resources)
+ }
+ },
}
}
--
Gitblit v1.10.0