From 953ef29f4e238ef9ae186ab79eeec1bf4f3921a6 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 24 Aug 2023 19:31:15 +0000
Subject: [PATCH] format, ensure ci runs on prs
---
quartz/bootstrap-cli.mjs | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 616f2ef..b191b49 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -162,7 +162,6 @@
label: "Symlink an existing folder",
hint: "don't select this unless you know what you are doing!",
},
- { value: "keep", label: "Keep the existing files" },
],
}),
)
@@ -176,6 +175,7 @@
}
}
+ await fs.promises.unlink(path.join(contentFolder, ".gitkeep"))
if (setupStrategy === "copy" || setupStrategy === "symlink") {
const originalFolder = escapePath(
exitIfCancel(
@@ -205,8 +205,6 @@
await fs.promises.symlink(originalFolder, contentFolder, "dir")
}
} else if (setupStrategy === "new") {
- await rmContentFolder()
- await fs.promises.mkdir(contentFolder)
await fs.promises.writeFile(
path.join(contentFolder, "index.md"),
`---
@@ -219,7 +217,7 @@
)
}
- // get a prefered link resolution strategy
+ // get a preferred link resolution strategy
const linkResolutionStrategy = exitIfCancel(
await select({
message: `Choose how Quartz should resolve links in your content. You can change this later in \`quartz.config.ts\`.`,
@@ -255,7 +253,7 @@
outro(`You're all set! Not sure what to do next? Try:
• Customizing Quartz a bit more by editing \`quartz.config.ts\`
• Running \`npx quartz build --serve\` to preview your Quartz locally
- • Hosting your Quartz online (see: https://quartz.jzhao.xyz/setup/hosting)
+ • Hosting your Quartz online (see: https://quartz.jzhao.xyz/hosting)
`)
})
.command("update", "Get the latest Quartz updates", CommonArgv, async (argv) => {
@@ -393,14 +391,28 @@
})
const buildMutex = new Mutex()
- const timeoutIds = new Set()
+ let lastBuildMs = 0
+ let cleanupBuild = null
const build = async (clientRefresh) => {
- await buildMutex.acquire()
+ const buildStart = new Date().getTime()
+ lastBuildMs = buildStart
+ const release = await buildMutex.acquire()
+ if (lastBuildMs > buildStart) {
+ release()
+ return
+ }
+
+ if (cleanupBuild) {
+ await cleanupBuild()
+ console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
+ }
+
const result = await ctx.rebuild().catch((err) => {
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
console.log(`Reason: ${chalk.grey(err)}`)
process.exit(1)
})
+ release()
if (argv.bundleInfo) {
const outputFileName = "quartz/.quartz-cache/transpiled-build.mjs"
@@ -416,15 +428,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()
- buildMutex.release()
- }
-
- const rebuild = (clientRefresh) => {
- timeoutIds.forEach((id) => clearTimeout(id))
- timeoutIds.clear()
- timeoutIds.add(setTimeout(() => build(clientRefresh), 250))
}
if (argv.serve) {
@@ -452,14 +457,22 @@
req.url = req.url?.slice(argv.baseDir.length)
const serve = async () => {
+ const release = await buildMutex.acquire()
await serveHandler(req, res, {
public: argv.output,
directoryListing: false,
+ headers: [
+ {
+ source: "**/*.html",
+ headers: [{ key: "Content-Disposition", value: "inline" }],
+ },
+ ],
})
const status = res.statusCode
const statusString =
status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
console.log(statusString + chalk.grey(` ${argv.baseDir}${req.url}`))
+ release()
}
const redirect = (newFp) => {
@@ -526,8 +539,7 @@
ignoreInitial: true,
})
.on("all", async () => {
- console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
- rebuild(clientRefresh)
+ build(clientRefresh)
})
} else {
await build(() => {})
--
Gitblit v1.10.0