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 | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/quartz/plugins/emitters/contentPage.tsx b/quartz/plugins/emitters/contentPage.tsx
index cc36831..59a24f2 100644
--- a/quartz/plugins/emitters/contentPage.tsx
+++ b/quartz/plugins/emitters/contentPage.tsx
@@ -4,11 +4,13 @@
import BodyConstructor from "../../components/Body"
import { pageResources, renderPage } from "../../components/renderPage"
import { FullPageLayout } from "../../cfg"
-import { FilePath } from "../../path"
+import { FilePath, canonicalizeServer } from "../../path"
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, pageBody: Content, left, right, footer: Footer } = opts
@@ -22,9 +24,9 @@
},
async emit(_contentDir, cfg, content, resources, emit): Promise<FilePath[]> {
const fps: FilePath[] = []
- const allFiles = content.map(c => c[1].data)
+ const allFiles = content.map((c) => c[1].data)
for (const [tree, file] of content) {
- const slug = file.data.slug!
+ const slug = canonicalizeServer(file.data.slug!)
const externalResources = pageResources(slug, resources)
const componentData: QuartzComponentProps = {
fileData: file.data,
@@ -32,17 +34,12 @@
cfg,
children: [],
tree,
- allFiles
+ allFiles,
}
- const content = renderPage(
- slug,
- componentData,
- opts,
- externalResources
- )
+ const content = renderPage(slug, componentData, opts, externalResources)
- const fp = file.data.slug + ".html" as FilePath
+ const fp = (file.data.slug + ".html") as FilePath
await emit({
content,
slug: file.data.slug!,
@@ -52,6 +49,6 @@
fps.push(fp)
}
return fps
- }
+ },
}
}
--
Gitblit v1.10.0