From 7c09627df4bd61e3b4fbd6fd84a1971b40ff72b3 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 05 Aug 2023 22:34:10 +0000
Subject: [PATCH] improve hot reload robustness
---
quartz/bootstrap-cli.mjs | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 40ef34e..68b9f57 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -353,9 +353,7 @@
],
})
- let clientRefresh = () => {}
- let closeHandler = null
- const build = async () => {
+ const build = async (clientRefresh) => {
const result = await ctx.rebuild().catch((err) => {
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
console.log(`Reason: ${chalk.grey(err)}`)
@@ -375,20 +373,17 @@
// bypass module cache
const { default: buildQuartz } = await import(cacheFile + `?update=${new Date()}`)
- if (closeHandler) {
- await closeHandler()
- }
-
- closeHandler = await buildQuartz(argv, clientRefresh)
+ await buildQuartz(argv, clientRefresh)
clientRefresh()
}
- await build()
if (argv.serve) {
const wss = new WebSocketServer({ port: 3001 })
const connections = []
wss.on("connection", (ws) => connections.push(ws))
- clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
+ const clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
+
+ await build(clientRefresh)
const server = http.createServer(async (req, res) => {
await serveHandler(req, res, {
public: argv.output,
@@ -412,9 +407,10 @@
})
.on("all", async () => {
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
- await build()
+ await build(clientRefresh)
})
} else {
+ await build(() => {})
ctx.dispose()
}
})
--
Gitblit v1.10.0