From 22de92f6c46fd8aae3e803faaea734f28277cfae Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 31 Jan 2024 18:01:40 +0000
Subject: [PATCH] pkg: bump to 4.1.6
---
quartz/plugins/emitters/folderPage.tsx | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/quartz/plugins/emitters/folderPage.tsx b/quartz/plugins/emitters/folderPage.tsx
index 4d22556..04a5a00 100644
--- a/quartz/plugins/emitters/folderPage.tsx
+++ b/quartz/plugins/emitters/folderPage.tsx
@@ -6,11 +6,20 @@
import { ProcessedContent, defaultProcessedContent } from "../vfile"
import { FullPageLayout } from "../../cfg"
import path from "path"
-import { FilePath, FullSlug, SimpleSlug, joinSegments, simplifySlug } from "../../util/path"
+import {
+ FilePath,
+ FullSlug,
+ SimpleSlug,
+ _stripSlashes,
+ joinSegments,
+ pathToRoot,
+ simplifySlug,
+} from "../../util/path"
import { defaultListPageLayout, sharedPageComponents } from "../../../quartz.layout"
import { FolderContent } from "../../components"
+import { write } from "./helpers"
-export const FolderPage: QuartzEmitterPlugin<FullPageLayout> = (userOpts) => {
+export const FolderPage: QuartzEmitterPlugin<Partial<FullPageLayout>> = (userOpts) => {
const opts: FullPageLayout = {
...sharedPageComponents,
...defaultListPageLayout,
@@ -27,7 +36,7 @@
getQuartzComponents() {
return [Head, Header, Body, ...header, ...beforeBody, pageBody, ...left, ...right, Footer]
},
- async emit(ctx, content, resources, emit): Promise<FilePath[]> {
+ async emit(ctx, content, resources): Promise<FilePath[]> {
const fps: FilePath[] = []
const allFiles = content.map((c) => c[1].data)
const cfg = ctx.cfg.configuration
@@ -54,7 +63,7 @@
)
for (const [tree, file] of content) {
- const slug = simplifySlug(file.data.slug!)
+ const slug = _stripSlashes(simplifySlug(file.data.slug!)) as SimpleSlug
if (folders.has(slug)) {
folderDescriptions[slug] = [tree, file]
}
@@ -62,7 +71,7 @@
for (const folder of folders) {
const slug = joinSegments(folder, "index") as FullSlug
- const externalResources = pageResources(slug, resources)
+ const externalResources = pageResources(pathToRoot(slug), resources)
const [tree, file] = folderDescriptions[folder]
const componentData: QuartzComponentProps = {
fileData: file.data,
@@ -74,7 +83,8 @@
}
const content = renderPage(slug, componentData, opts, externalResources)
- const fp = await emit({
+ const fp = await write({
+ ctx,
content,
slug,
ext: ".html",
--
Gitblit v1.10.0