From 6d49d975598cd7f48e2b7347c2b83d8aac6a2f56 Mon Sep 17 00:00:00 2001
From: Aswanth <aswanth366@gmail.com>
Date: Sat, 24 May 2025 04:55:07 +0000
Subject: [PATCH] fix(analytics): streamline posthog script loading and event capturing (#1974)
---
quartz/cli/handlers.js | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index 6ef3805..0cb371b 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -225,6 +225,10 @@
* @param {*} argv arguments for `build`
*/
export async function handleBuild(argv) {
+ if (argv.serve) {
+ argv.watch = true
+ }
+
console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
const ctx = await esbuild.context({
entryPoints: [fp],
@@ -331,9 +335,10 @@
clientRefresh()
}
+ let clientRefresh = () => {}
if (argv.serve) {
const connections = []
- const clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
+ clientRefresh = () => connections.forEach((conn) => conn.send("rebuild"))
if (argv.baseDir !== "" && !argv.baseDir.startsWith("/")) {
argv.baseDir = "/" + argv.baseDir
@@ -433,6 +438,7 @@
return serve()
})
+
server.listen(argv.port)
const wss = new WebSocketServer({ port: argv.wsPort })
wss.on("connection", (ws) => connections.push(ws))
@@ -441,16 +447,27 @@
`Started a Quartz server listening at http://localhost:${argv.port}${argv.baseDir}`,
),
)
- console.log("hint: exit with ctrl+c")
- const paths = await globby(["**/*.ts", "**/*.tsx", "**/*.scss", "package.json"])
+ } else {
+ await build(clientRefresh)
+ ctx.dispose()
+ }
+
+ if (argv.watch) {
+ const paths = await globby([
+ "**/*.ts",
+ "quartz/cli/*.js",
+ "quartz/static/**/*",
+ "**/*.tsx",
+ "**/*.scss",
+ "package.json",
+ ])
chokidar
.watch(paths, { ignoreInitial: true })
.on("add", () => build(clientRefresh))
.on("change", () => build(clientRefresh))
.on("unlink", () => build(clientRefresh))
- } else {
- await build(() => {})
- ctx.dispose()
+
+ console.log(chalk.grey("hint: exit with ctrl+c"))
}
}
@@ -572,7 +589,8 @@
await popContentFolder(contentFolder)
if (argv.push) {
console.log("Pushing your changes")
- const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
+ const currentBranch = execSync("git rev-parse --abbrev-ref HEAD").toString().trim()
+ const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, currentBranch], {
stdio: "inherit",
})
if (res.status !== 0) {
--
Gitblit v1.10.0