From 3ac6b42e16dca5a44ed3fec2c0314f1dbbc2322b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:02:12 +0000
Subject: [PATCH] finish path refactoring, add sourcemap + better trace support
---
quartz/processors/emit.ts | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/quartz/processors/emit.ts b/quartz/processors/emit.ts
index 7150f5e..0276ad4 100644
--- a/quartz/processors/emit.ts
+++ b/quartz/processors/emit.ts
@@ -5,10 +5,9 @@
import { ComponentResources, emitComponentResources, getComponentResources, getStaticResourcesFromPlugins } from "../plugins"
import { EmitCallback } from "../plugins/types"
import { ProcessedContent } from "../plugins/vfile"
-import { QUARTZ, slugify } from "../path"
+import { FilePath, QUARTZ, slugifyFilePath } from "../path"
import { globbyStream } from "globby"
import chalk from "chalk"
-import { googleFontHref } from '../theme'
// @ts-ignore
import spaRouterScript from '../components/scripts/spa.inline'
@@ -18,9 +17,11 @@
import popoverScript from '../components/scripts/popover.inline'
import popoverStyle from '../components/styles/popover.scss'
import { StaticResources } from "../resources"
+import { QuartzLogger } from "../log"
+import { googleFontHref } from "../theme"
+import { trace } from "../trace"
function addGlobalPageResources(cfg: GlobalConfiguration, staticResources: StaticResources, componentResources: ComponentResources) {
- // font and other resources
staticResources.css.push(googleFontHref(cfg.theme))
// popovers
@@ -67,8 +68,11 @@
export async function emitContent(contentFolder: string, output: string, cfg: QuartzConfig, content: ProcessedContent[], verbose: boolean) {
const perf = new PerfTimer()
+ const log = new QuartzLogger(verbose)
+
+ log.start(`Emitting output files`)
const emit: EmitCallback = async ({ slug, ext, content }) => {
- const pathToPage = path.join(output, slug + ext)
+ const pathToPage = path.join(output, slug + ext) as FilePath
const dir = path.dirname(pathToPage)
await fs.promises.mkdir(dir, { recursive: true })
await fs.promises.writeFile(pathToPage, content)
@@ -80,6 +84,7 @@
// component specific scripts and styles
const componentResources = getComponentResources(cfg.plugins)
+
// important that this goes *after* component scripts
// as the "nav" event gets triggered here and we should make sure
// that everyone else had the chance to register a listener for it
@@ -106,7 +111,7 @@
}
}
} catch (err) {
- console.log(chalk.red(`Failed to emit from plugin \`${emitter.name}\`: `) + err)
+ trace(`Failed to emit from plugin \`${emitter.name}\``, err as Error)
process.exit(1)
}
}
@@ -119,15 +124,16 @@
// glob all non MD/MDX/HTML files in content folder and copy it over
const assetsPath = path.join(output, "assets")
- for await (const fp of globbyStream("**", {
+ for await (const rawFp of globbyStream("**", {
ignore: ["**/*.md"],
cwd: contentFolder,
})) {
- const ext = path.extname(fp as string)
- const src = path.join(contentFolder, fp as string)
- const name = slugify(fp as string) + ext
- const dest = path.join(assetsPath, name)
- const dir = path.dirname(dest)
+ const fp = rawFp as FilePath
+ const ext = path.extname(fp)
+ const src = path.join(contentFolder, fp) as FilePath
+ const name = slugifyFilePath(fp as FilePath) + ext as FilePath
+ const dest = path.join(assetsPath, name) as FilePath
+ const dir = path.dirname(dest) as FilePath
await fs.promises.mkdir(dir, { recursive: true }) // ensure dir exists
await fs.promises.copyFile(src, dest)
emittedFiles += 1
@@ -136,5 +142,5 @@
}
}
- console.log(`Emitted ${emittedFiles} files to \`${output}\` in ${perf.timeSince()}`)
+ log.success(`Emitted ${emittedFiles} files to \`${output}\` in ${perf.timeSince()}`)
}
--
Gitblit v1.10.0