From 1406ee0f05dc688e1b7635d3ce14e63d1c42a973 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 04 Jun 2023 17:37:43 +0000
Subject: [PATCH] update spinners
---
quartz/processors/emit.ts | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/quartz/processors/emit.ts b/quartz/processors/emit.ts
index e6e734e..3407de2 100644
--- a/quartz/processors/emit.ts
+++ b/quartz/processors/emit.ts
@@ -2,17 +2,15 @@
import fs from "fs"
import { QuartzConfig } from "../cfg"
import { PerfTimer } from "../perf"
-import { getStaticResourcesFromPlugins } from "../plugins"
+import { emitComponentResources, getStaticResourcesFromPlugins } from "../plugins"
import { EmitCallback } from "../plugins/types"
import { ProcessedContent } from "../plugins/vfile"
import { QUARTZ, slugify } from "../path"
import { globbyStream } from "globby"
+import chalk from "chalk"
-export async function emitContent(output: string, cfg: QuartzConfig, content: ProcessedContent[], verbose: boolean) {
+export async function emitContent(contentFolder: string, output: string, cfg: QuartzConfig, content: ProcessedContent[], verbose: boolean) {
const perf = new PerfTimer()
-
-
- const staticResources = getStaticResourcesFromPlugins(cfg.plugins)
const emit: EmitCallback = async ({ slug, ext, content }) => {
const pathToPage = path.join(output, slug + ext)
const dir = path.dirname(pathToPage)
@@ -21,29 +19,40 @@
return pathToPage
}
+ const staticResources = getStaticResourcesFromPlugins(cfg.plugins)
+ emitComponentResources(cfg.configuration, staticResources, cfg.plugins, emit)
+
let emittedFiles = 0
for (const emitter of cfg.plugins.emitters) {
- const emitted = await emitter.emit(content, staticResources, emit)
- emittedFiles += emitted.length
+ try {
+ const emitted = await emitter.emit(cfg.configuration, content, staticResources, emit)
+ emittedFiles += emitted.length
- if (verbose) {
- for (const file of emitted) {
- console.log(`[emit:${emitter.name}] ${file}`)
+ if (verbose) {
+ for (const file of emitted) {
+ console.log(`[emit:${emitter.name}] ${file}`)
+ }
}
+ } catch (err) {
+ console.log(chalk.red(`Failed to emit from plugin \`${emitter.name}\`: `) + err)
+ process.exit(1)
}
}
const staticPath = path.join(QUARTZ, "static")
await fs.promises.cp(staticPath, path.join(output, "static"), { recursive: true })
+ if (verbose) {
+ console.log(`[emit:Static] ${path.join(output, "static", "**")}`)
+ }
// 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,mdx,html}"],
- cwd: "./content",
+ ignore: ["**/*.md"],
+ cwd: contentFolder,
})) {
const ext = path.extname(fp as string)
- const src = path.join("content", 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
@@ -54,8 +63,5 @@
}
}
- if (verbose) {
- console.log(`[emit:Static] ${path.join(output, "static", "**")}`)
- console.log(`Emitted ${emittedFiles} files to \`${output}\` in ${perf.timeSince()}`)
- }
+ console.log(`Emitted ${emittedFiles} files to \`${output}\` in ${perf.timeSince()}`)
}
--
Gitblit v1.10.0