From 2d6dc176c3e1fbb520a5da1beb60bbb1d8e948ba Mon Sep 17 00:00:00 2001
From: Pelayo Arbués <gonzalezpelayo@gmail.com>
Date: Thu, 31 Aug 2023 19:12:06 +0000
Subject: [PATCH] Adds Pelayo Arbues to showcase (#435)
---
quartz/build.ts | 98 ++++++++++++++++++++++++++++---------------------
1 files changed, 56 insertions(+), 42 deletions(-)
diff --git a/quartz/build.ts b/quartz/build.ts
index b5b1f9e..22288ac 100644
--- a/quartz/build.ts
+++ b/quartz/build.ts
@@ -16,8 +16,9 @@
import { glob, toPosixPath } from "./util/glob"
import { trace } from "./util/trace"
import { options } from "./util/sourcemap"
+import { Mutex } from "async-mutex"
-async function buildQuartz(argv: Argv, clientRefresh: () => void) {
+async function buildQuartz(argv: Argv, mut: Mutex, clientRefresh: () => void) {
const ctx: BuildCtx = {
argv,
cfg,
@@ -37,13 +38,14 @@
console.log(` Emitters: ${pluginNames("emitters").join(", ")}`)
}
+ const release = await mut.acquire()
perf.addEvent("clean")
await rimraf(output)
console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince("clean")}`)
perf.addEvent("glob")
const allFiles = await glob("**/*.*", argv.directory, cfg.configuration.ignorePatterns)
- const fps = allFiles.filter((fp) => fp.endsWith(".md"))
+ const fps = allFiles.filter((fp) => fp.endsWith(".md")).sort()
console.log(
`Found ${fps.length} input files from \`${argv.directory}\` in ${perf.timeSince("glob")}`,
)
@@ -55,15 +57,17 @@
const filteredContent = filterContent(ctx, parsedFiles)
await emitContent(ctx, filteredContent)
console.log(chalk.green(`Done processing ${fps.length} files in ${perf.timeSince()}`))
+ release()
if (argv.serve) {
- return startServing(ctx, parsedFiles, clientRefresh)
+ return startServing(ctx, mut, parsedFiles, clientRefresh)
}
}
// setup watcher for rebuilds
async function startServing(
ctx: BuildCtx,
+ mut: Mutex,
initialContent: ProcessedContent[],
clientRefresh: () => void,
) {
@@ -77,10 +81,10 @@
}
const initialSlugs = ctx.allSlugs
- let timeoutIds: Set<ReturnType<typeof setTimeout>> = new Set()
- let toRebuild: Set<FilePath> = new Set()
- let toRemove: Set<FilePath> = new Set()
- let trackedAssets: Set<FilePath> = new Set()
+ let lastBuildMs = 0
+ const toRebuild: Set<FilePath> = new Set()
+ const toRemove: Set<FilePath> = new Set()
+ const trackedAssets: Set<FilePath> = new Set()
async function rebuild(fp: string, action: "add" | "change" | "delete") {
// don't do anything for gitignored files
if (ignored(fp)) {
@@ -106,45 +110,51 @@
toRemove.add(filePath)
}
- timeoutIds.forEach((id) => clearTimeout(id))
-
// debounce rebuilds every 250ms
- timeoutIds.add(
- setTimeout(async () => {
- const perf = new PerfTimer()
- console.log(chalk.yellow("Detected change, rebuilding..."))
- try {
- const filesToRebuild = [...toRebuild].filter((fp) => !toRemove.has(fp))
- const trackedSlugs = [...new Set([...contentMap.keys(), ...toRebuild, ...trackedAssets])]
- .filter((fp) => !toRemove.has(fp))
- .map((fp) => slugifyFilePath(path.posix.relative(argv.directory, fp) as FilePath))
+ const buildStart = new Date().getTime()
+ lastBuildMs = buildStart
+ const release = await mut.acquire()
+ if (lastBuildMs > buildStart) {
+ release()
+ return
+ }
- ctx.allSlugs = [...new Set([...initialSlugs, ...trackedSlugs])]
- const parsedContent = await parseMarkdown(ctx, filesToRebuild)
- for (const content of parsedContent) {
- const [_tree, vfile] = content
- contentMap.set(vfile.data.filePath!, content)
- }
+ const perf = new PerfTimer()
+ console.log(chalk.yellow("Detected change, rebuilding..."))
+ try {
+ const filesToRebuild = [...toRebuild].filter((fp) => !toRemove.has(fp))
- for (const fp of toRemove) {
- contentMap.delete(fp)
- }
+ const trackedSlugs = [...new Set([...contentMap.keys(), ...toRebuild, ...trackedAssets])]
+ .filter((fp) => !toRemove.has(fp))
+ .map((fp) => slugifyFilePath(path.posix.relative(argv.directory, fp) as FilePath))
- await rimraf(argv.output)
- const parsedFiles = [...contentMap.values()]
- const filteredContent = filterContent(ctx, parsedFiles)
- await emitContent(ctx, filteredContent)
- console.log(chalk.green(`Done rebuilding in ${perf.timeSince()}`))
- } catch {
- console.log(chalk.yellow(`Rebuild failed. Waiting on a change to fix the error...`))
- }
+ ctx.allSlugs = [...new Set([...initialSlugs, ...trackedSlugs])]
+ const parsedContent = await parseMarkdown(ctx, filesToRebuild)
+ for (const content of parsedContent) {
+ const [_tree, vfile] = content
+ contentMap.set(vfile.data.filePath!, content)
+ }
- clientRefresh()
- toRebuild.clear()
- toRemove.clear()
- }, 250),
- )
+ for (const fp of toRemove) {
+ contentMap.delete(fp)
+ }
+
+ const parsedFiles = [...contentMap.values()]
+ const filteredContent = filterContent(ctx, parsedFiles)
+ // TODO: we can probably traverse the link graph to figure out what's safe to delete here
+ // instead of just deleting everything
+ await rimraf(argv.output)
+ await emitContent(ctx, filteredContent)
+ console.log(chalk.green(`Done rebuilding in ${perf.timeSince()}`))
+ } catch {
+ console.log(chalk.yellow(`Rebuild failed. Waiting on a change to fix the error...`))
+ }
+
+ clientRefresh()
+ toRebuild.clear()
+ toRemove.clear()
+ release()
}
const watcher = chokidar.watch(".", {
@@ -157,11 +167,15 @@
.on("add", (fp) => rebuild(fp, "add"))
.on("change", (fp) => rebuild(fp, "change"))
.on("unlink", (fp) => rebuild(fp, "delete"))
+
+ return async () => {
+ await watcher.close()
+ }
}
-export default async (argv: Argv, clientRefresh: () => void) => {
+export default async (argv: Argv, mut: Mutex, clientRefresh: () => void) => {
try {
- return await buildQuartz(argv, clientRefresh)
+ return await buildQuartz(argv, mut, clientRefresh)
} catch (err) {
trace("\nExiting Quartz due to a fatal error", err as Error)
}
--
Gitblit v1.10.0