From 99dbe525d9b221bf12778ed899c94ef103a77c45 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 23 Aug 2023 05:27:41 +0000
Subject: [PATCH] fix: properly lock across source and content refresh by sharing a mutex
---
quartz/bootstrap-cli.mjs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 6a975ca..47c58ab 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -394,12 +394,12 @@
const buildMutex = new Mutex()
const timeoutIds = new Set()
- let firstBuild = true
+ let cleanupBuild = null
const build = async (clientRefresh) => {
const release = await buildMutex.acquire()
- if (firstBuild) {
- firstBuild = false
- } else {
+
+ if (cleanupBuild) {
+ await cleanupBuild()
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
}
@@ -408,6 +408,7 @@
console.log(`Reason: ${chalk.grey(err)}`)
process.exit(1)
})
+ release()
if (argv.bundleInfo) {
const outputFileName = "quartz/.quartz-cache/transpiled-build.mjs"
@@ -423,9 +424,8 @@
// bypass module cache
// https://github.com/nodejs/modules/issues/307
const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`)
- await buildQuartz(argv, clientRefresh)
+ cleanupBuild = await buildQuartz(argv, buildMutex, clientRefresh)
clientRefresh()
- release()
}
const rebuild = (clientRefresh) => {
--
Gitblit v1.10.0