From 1da467d2143a260af8e5b7d2d2f68f0fcaa0260c Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 05 Aug 2023 23:43:50 +0000
Subject: [PATCH] non-admonition callout fix

---
 quartz/bootstrap-cli.mjs |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 40ef34e..d550aea 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -16,6 +16,7 @@
 import http from "http"
 import serveHandler from "serve-handler"
 import { WebSocketServer } from "ws"
+import { randomUUID } from "crypto"
 
 const ORIGIN_NAME = "origin"
 const UPSTREAM_NAME = "upstream"
@@ -304,7 +305,8 @@
       jsxImportSource: "preact",
       packages: "external",
       metafile: true,
-      sourcemap: true,
+      sourcemap: "inline",
+      sourcesContent: false,
       plugins: [
         sassPlugin({
           type: "css-text",
@@ -353,9 +355,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)}`)
@@ -374,21 +374,18 @@
       }
 
       // bypass module cache
-      const { default: buildQuartz } = await import(cacheFile + `?update=${new Date()}`)
-      if (closeHandler) {
-        await closeHandler()
-      }
-
-      closeHandler = await buildQuartz(argv, clientRefresh)
+      const { default: buildQuartz } = await import(cacheFile + `?update=${randomUUID()}`)
+      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 +409,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