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/processors/emit.ts | 59 +++++++++++++++++++++--------------------------------------
1 files changed, 21 insertions(+), 38 deletions(-)
diff --git a/quartz/processors/emit.ts b/quartz/processors/emit.ts
index ec465ba..3b357aa 100644
--- a/quartz/processors/emit.ts
+++ b/quartz/processors/emit.ts
@@ -1,20 +1,22 @@
import path from "path"
import fs from "fs"
-import { QuartzConfig } from "../cfg"
-import { PerfTimer } from "../perf"
+import { PerfTimer } from "../util/perf"
import { getStaticResourcesFromPlugins } from "../plugins"
import { EmitCallback } from "../plugins/types"
import { ProcessedContent } from "../plugins/vfile"
-import { QUARTZ, slugify } from "../path"
-import { globbyStream } from "globby"
+import { FilePath, joinSegments } from "../util/path"
+import { QuartzLogger } from "../util/log"
+import { trace } from "../util/trace"
+import { BuildCtx } from "../util/ctx"
-export async function emitContent(contentFolder: string, output: string, cfg: QuartzConfig, content: ProcessedContent[], verbose: boolean) {
+export async function emitContent(ctx: BuildCtx, content: ProcessedContent[]) {
+ const { argv, cfg } = ctx
const perf = new PerfTimer()
+ const log = new QuartzLogger(ctx.argv.verbose)
-
- const staticResources = getStaticResourcesFromPlugins(cfg.plugins)
+ log.start(`Emitting output files`)
const emit: EmitCallback = async ({ slug, ext, content }) => {
- const pathToPage = path.join(output, slug + ext)
+ const pathToPage = joinSegments(argv.output, slug + ext) as FilePath
const dir = path.dirname(pathToPage)
await fs.promises.mkdir(dir, { recursive: true })
await fs.promises.writeFile(pathToPage, content)
@@ -22,40 +24,21 @@
}
let emittedFiles = 0
+ const staticResources = getStaticResourcesFromPlugins(ctx)
for (const emitter of cfg.plugins.emitters) {
- const emitted = await emitter.emit(content, staticResources, emit)
- emittedFiles += emitted.length
+ try {
+ const emitted = await emitter.emit(ctx, content, staticResources, emit)
+ emittedFiles += emitted.length
- if (verbose) {
- for (const file of emitted) {
- console.log(`[emit:${emitter.name}] ${file}`)
+ if (ctx.argv.verbose) {
+ for (const file of emitted) {
+ console.log(`[emit:${emitter.name}] ${file}`)
+ }
}
+ } catch (err) {
+ trace(`Failed to emit from plugin \`${emitter.name}\``, err as Error)
}
}
- const staticPath = path.join(QUARTZ, "static")
- await fs.promises.cp(staticPath, path.join(output, "static"), { recursive: true })
-
- // glob all non MD/MDX/HTML files in content folder and copy it over
- const assetsPath = path.join("public", "assets")
- for await (const fp of globbyStream("**", {
- ignore: ["**/*.md"],
- cwd: contentFolder,
- })) {
- const ext = path.extname(fp as string)
- const src = path.join(contentFolder, fp as string)
- const dest = path.join(assetsPath, slugify(fp as string) + ext)
- const dir = path.dirname(dest)
- await fs.promises.mkdir(dir, { recursive: true }) // ensure dir exists
- await fs.promises.copyFile(src, dest)
- emittedFiles += 1
- if (verbose) {
- console.log(`[emit:Assets] ${dest}`)
- }
- }
-
- if (verbose) {
- console.log(`[emit:Static] ${path.join(output, "static", "**")}`)
- console.log(`Emitted ${emittedFiles} files to \`${output}\` in ${perf.timeSince()}`)
- }
+ log.end(`Emitted ${emittedFiles} files to \`${argv.output}\` in ${perf.timeSince()}`)
}
--
Gitblit v1.10.0