scapegoat/Docs2.git

			@@ -9,10 +9,7 @@
			import { Root, Element, ElementContent } from "hast"
			import { GlobalConfiguration } from "../cfg"
			import { i18n } from "../i18n"
			// @ts-ignore
			import mermaidScript from "./scripts/mermaid.inline"
			import mermaidStyle from "./styles/mermaid.inline.scss"
			import { QuartzPluginData } from "../plugins/vfile"
			import { styleText } from "util"

			interface RenderComponents {
			head: QuartzComponent
			@@ -28,7 +25,6 @@
			const headerRegex = new RegExp(/h[1-6]/)
			export function pageResources(
			baseDir: FullSlug \| RelativeURL,
			fileData: QuartzPluginData,
			staticResources: StaticResources,
			): StaticResources {
			const contentIndexPath = joinSegments(baseDir, "static/contentIndex.json")
			@@ -58,17 +54,6 @@
			additionalHead: staticResources.additionalHead,
			}

			if (fileData.hasMermaidDiagram) {
			resources.js.push({
			script: mermaidScript,
			loadTime: "afterDOMReady",
			moduleType: "module",
			contentType: "inline",
			})
			resources.css.push({ content: mermaidStyle, inline: true })
			}

			// NOTE: we have to put this last to make sure spa.inline.ts is the last item.
			resources.js.push({
			src: joinSegments(baseDir, "postscript.js"),
			loadTime: "afterDOMReady",
			@@ -79,24 +64,44 @@
			return resources
			}

			export function renderPage(
			function renderTranscludes(
			root: Root,
			cfg: GlobalConfiguration,
			slug: FullSlug,
			componentData: QuartzComponentProps,
			components: RenderComponents,
			pageResources: StaticResources,
			): string {
			// make a deep copy of the tree so we don't remove the transclusion references
			// for the file cached in contentMap in build.ts
			const root = clone(componentData.tree) as Root

			visited: Set<FullSlug>,
			) {
			// process transcludes in componentData
			visit(root, "element", (node, _index, _parent) => {
			if (node.tagName === "blockquote") {
			const classNames = (node.properties?.className ?? []) as string[]
			if (classNames.includes("transclude")) {
			const inner = node.children[0] as Element
			const transcludeTarget = inner.properties["data-slug"] as FullSlug
			const transcludeTarget = (inner.properties["data-slug"] ?? slug) as FullSlug
			if (visited.has(transcludeTarget)) {
			console.warn(
			styleText(
			"yellow",
			`Warning: Skipping circular transclusion: ${slug} -> ${transcludeTarget}`,
			),
			)
			node.children = [
			{
			type: "element",
			tagName: "p",
			properties: { style: "color: var(--secondary);" },
			children: [
			{
			type: "text",
			value: `Circular transclusion detected: ${transcludeTarget}`,
			},
			],
			},
			]
			return
			}
			visited.add(transcludeTarget)

			const page = componentData.allFiles.find((f) => f.slug === transcludeTarget)
			if (!page) {
			return
			@@ -205,6 +210,20 @@
			}
			}
			})
			}

			export function renderPage(
			cfg: GlobalConfiguration,
			slug: FullSlug,
			componentData: QuartzComponentProps,
			components: RenderComponents,
			pageResources: StaticResources,
			): string {
			// make a deep copy of the tree so we don't remove the transclusion references
			// for the file cached in contentMap in build.ts
			const root = clone(componentData.tree) as Root
			const visited = new Set<FullSlug>([slug])
			renderTranscludes(root, cfg, slug, componentData, visited)

			// set componentData.tree to the edited html that has transclusions rendered
			componentData.tree = root
			@@ -239,8 +258,9 @@
			)

			const lang = componentData.fileData.frontmatter?.lang ?? cfg.locale?.split("-")[0] ?? "en"
			const direction = i18n(cfg.locale).direction ?? "ltr"
			const doc = (
			<html lang={lang}>
			<html lang={lang} dir={direction}>
			<Head {...componentData} />
			<body data-slug={slug}>
			<div id="quartz-root" class="page">
			@@ -274,7 +294,7 @@
			</body>
			{pageResources.js
			.filter((resource) => resource.loadTime === "afterDOMReady")
			.map((res) => JSResourceToScriptElement(res))}
			.map((res) => JSResourceToScriptElement(res, true))}
			</html>
			)