From 340e3ef5116cd99c8ddfdbb3d9e0bbd914e07825 Mon Sep 17 00:00:00 2001
From: Ben Schlegel <31989404+benschlegel@users.noreply.github.com>
Date: Fri, 25 Aug 2023 16:03:49 +0000
Subject: [PATCH] feat(consistency): Add `.obsidian` to ignorePatterns (#420)
---
quartz/bootstrap-cli.mjs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index d068cd8..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\`.`,
@@ -393,13 +391,19 @@
})
const buildMutex = new Mutex()
- const timeoutIds = new Set()
- let firstBuild = true
+ let lastBuildMs = 0
+ let cleanupBuild = null
const build = async (clientRefresh) => {
+ const buildStart = new Date().getTime()
+ lastBuildMs = buildStart
const release = await buildMutex.acquire()
- if (firstBuild) {
- firstBuild = false
- } else {
+ if (lastBuildMs > buildStart) {
+ release()
+ return
+ }
+
+ if (cleanupBuild) {
+ await cleanupBuild()
console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
}
@@ -408,6 +412,7 @@
console.log(`Reason: ${chalk.grey(err)}`)
process.exit(1)
})
+ release()
if (argv.bundleInfo) {
const outputFileName = "quartz/.quartz-cache/transpiled-build.mjs"
@@ -423,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()
- release()
- }
-
- const rebuild = (clientRefresh) => {
- timeoutIds.forEach((id) => clearTimeout(id))
- timeoutIds.clear()
- timeoutIds.add(setTimeout(() => build(clientRefresh), 250))
}
if (argv.serve) {
@@ -459,6 +457,7 @@
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,
@@ -473,6 +472,7 @@
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) => {
@@ -539,7 +539,7 @@
ignoreInitial: true,
})
.on("all", async () => {
- rebuild(clientRefresh)
+ build(clientRefresh)
})
} else {
await build(() => {})
--
Gitblit v1.10.0