From 0c199975f2d469ecdfd7efcf2ddd16ffa1dc492b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 17 Aug 2023 07:55:28 +0000
Subject: [PATCH] various path fixes for links to extensions, fix relative paths in links
---
quartz/build.ts | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/quartz/build.ts b/quartz/build.ts
index ae5fd40..779ab35 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 = {
@@ -91,6 +76,7 @@
contentMap.set(vfile.data.filePath!, content)
}
+ const initialSlugs = ctx.allSlugs
let timeoutId: ReturnType<typeof setTimeout> | null = null
let toRebuild: Set<FilePath> = new Set()
let toRemove: Set<FilePath> = new Set()
@@ -102,20 +88,18 @@
}
// 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") {
- fp = toPosixPath(fp)
- const filePath = joinSegments(argv.directory, fp) as FilePath
if (action === "add" || action === "change") {
trackedAssets.add(filePath)
} else if (action === "delete") {
- trackedAssets.add(filePath)
+ trackedAssets.delete(filePath)
}
clientRefresh()
return
}
- fp = toPosixPath(fp)
- const filePath = joinSegments(argv.directory, fp) as FilePath
if (action === "add" || action === "change") {
toRebuild.add(filePath)
} else if (action === "delete") {
@@ -133,10 +117,11 @@
try {
const filesToRebuild = [...toRebuild].filter((fp) => !toRemove.has(fp))
- ctx.allSlugs = [...new Set([...contentMap.keys(), ...toRebuild, ...trackedAssets])]
+ 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
--
Gitblit v1.10.0