From 0998bc355e6425e6b2bdf3d2da7124aa7b63b2a2 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 08:58:11 +0000
Subject: [PATCH] fix rebuild debouncing

---
 quartz/build.ts |   81 +++++++++++++++++++---------------------
 1 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/quartz/build.ts b/quartz/build.ts
index 9f38882..b5b1f9e 100644
--- a/quartz/build.ts
+++ b/quartz/build.ts
@@ -1,21 +1,7 @@
 import sourceMapSupport from "source-map-support"
-sourceMapSupport.install({
-  retrieveSourceMap(source) {
-    // source map hack to get around query param
-    // import cache busting
-    if (source.includes(".quartz-cache")) {
-      let realSource = fileURLToPath(source.split("?", 2)[0] + '.map')
-      return {
-        map: fs.readFileSync(realSource, 'utf8')
-      }
-    } else {
-      return null
-    }
-  }
-})
-
+sourceMapSupport.install(options)
 import path from "path"
-import { PerfTimer } from "./perf"
+import { PerfTimer } from "./util/perf"
 import { rimraf } from "rimraf"
 import { isGitIgnored } from "globby"
 import chalk from "chalk"
@@ -23,14 +9,13 @@
 import { filterContent } from "./processors/filter"
 import { emitContent } from "./processors/emit"
 import cfg from "../quartz.config"
-import { FilePath, joinSegments, slugifyFilePath } from "./path"
+import { FilePath, joinSegments, slugifyFilePath } from "./util/path"
 import chokidar from "chokidar"
 import { ProcessedContent } from "./plugins/vfile"
-import { Argv, BuildCtx } from "./ctx"
-import { glob, toPosixPath } from "./glob"
-import { trace } from "./trace"
-import { fileURLToPath } from "url"
-import fs from "fs"
+import { Argv, BuildCtx } from "./util/ctx"
+import { glob, toPosixPath } from "./util/glob"
+import { trace } from "./util/trace"
+import { options } from "./util/sourcemap"
 
 async function buildQuartz(argv: Argv, clientRefresh: () => void) {
   const ctx: BuildCtx = {
@@ -57,13 +42,14 @@
   console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince("clean")}`)
 
   perf.addEvent("glob")
-  const fps = await glob("**/*.md", argv.directory, cfg.configuration.ignorePatterns)
+  const allFiles = await glob("**/*.*", argv.directory, cfg.configuration.ignorePatterns)
+  const fps = allFiles.filter((fp) => fp.endsWith(".md"))
   console.log(
     `Found ${fps.length} input files from \`${argv.directory}\` in ${perf.timeSince("glob")}`,
   )
 
   const filePaths = fps.map((fp) => joinSegments(argv.directory, fp) as FilePath)
-  ctx.allSlugs = fps.map((fp) => slugifyFilePath(fp as FilePath))
+  ctx.allSlugs = allFiles.map((fp) => slugifyFilePath(fp as FilePath))
 
   const parsedFiles = await parseMarkdown(ctx, filePaths)
   const filteredContent = filterContent(ctx, parsedFiles)
@@ -90,40 +76,51 @@
     contentMap.set(vfile.data.filePath!, content)
   }
 
-  let timeoutId: ReturnType<typeof setTimeout> | null = null
+  const initialSlugs = ctx.allSlugs
+  let timeoutIds: Set<ReturnType<typeof setTimeout>> = new Set()
   let toRebuild: Set<FilePath> = new Set()
   let toRemove: Set<FilePath> = new Set()
+  let trackedAssets: Set<FilePath> = new Set()
   async function rebuild(fp: string, action: "add" | "change" | "delete") {
+    // don't do anything for gitignored files
+    if (ignored(fp)) {
+      return
+    }
+
+    // dont bother rebuilding for non-content files, just track and refresh
+    fp = toPosixPath(fp)
+    const filePath = joinSegments(argv.directory, fp) as FilePath
     if (path.extname(fp) !== ".md") {
-      // dont bother rebuilding for non-content files, just refresh
+      if (action === "add" || action === "change") {
+        trackedAssets.add(filePath)
+      } else if (action === "delete") {
+        trackedAssets.delete(filePath)
+      }
       clientRefresh()
       return
     }
 
-    fp = toPosixPath(fp)
-    if (!ignored(fp)) {
-      const filePath = joinSegments(argv.directory, fp) as FilePath
-      if (action === "add" || action === "change") {
-        toRebuild.add(filePath)
-      } else if (action === "delete") {
-        toRemove.add(filePath)
-      }
+    if (action === "add" || action === "change") {
+      toRebuild.add(filePath)
+    } else if (action === "delete") {
+      toRemove.add(filePath)
+    }
 
-      if (timeoutId) {
-        clearTimeout(timeoutId)
-      }
+    timeoutIds.forEach((id) => clearTimeout(id))
 
-      // debounce rebuilds every 250ms
-      timeoutId = setTimeout(async () => {
+    // debounce rebuilds every 250ms
+    timeoutIds.add(
+      setTimeout(async () => {
         const perf = new PerfTimer()
         console.log(chalk.yellow("Detected change, rebuilding..."))
         try {
           const filesToRebuild = [...toRebuild].filter((fp) => !toRemove.has(fp))
 
-          ctx.allSlugs = [...new Set([...contentMap.keys(), ...toRebuild])]
+          const trackedSlugs = [...new Set([...contentMap.keys(), ...toRebuild, ...trackedAssets])]
             .filter((fp) => !toRemove.has(fp))
             .map((fp) => slugifyFilePath(path.posix.relative(argv.directory, fp) as FilePath))
 
+          ctx.allSlugs = [...new Set([...initialSlugs, ...trackedSlugs])]
           const parsedContent = await parseMarkdown(ctx, filesToRebuild)
           for (const content of parsedContent) {
             const [_tree, vfile] = content
@@ -146,8 +143,8 @@
         clientRefresh()
         toRebuild.clear()
         toRemove.clear()
-      }, 250)
-    }
+      }, 250),
+    )
   }
 
   const watcher = chokidar.watch(".", {

--
Gitblit v1.10.0