mirror of
https://github.com/alrayyes/wiki.git
synced 2024-11-25 21:16:21 +00:00
fix shortest path for non-md files, mobile fix
This commit is contained in:
parent
075ac33474
commit
d8d9dd22c9
4 changed files with 62 additions and 49 deletions
|
@ -57,13 +57,14 @@ async function buildQuartz(argv: Argv, clientRefresh: () => void) {
|
|||
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)
|
||||
|
@ -93,15 +94,27 @@ async function startServing(
|
|||
let timeoutId: ReturnType<typeof setTimeout> | null = null
|
||||
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
|
||||
if (path.extname(fp) !== ".md") {
|
||||
// dont bother rebuilding for non-content files, just refresh
|
||||
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)
|
||||
}
|
||||
clientRefresh()
|
||||
return
|
||||
}
|
||||
|
||||
fp = toPosixPath(fp)
|
||||
if (!ignored(fp)) {
|
||||
const filePath = joinSegments(argv.directory, fp) as FilePath
|
||||
if (action === "add" || action === "change") {
|
||||
toRebuild.add(filePath)
|
||||
|
@ -120,7 +133,7 @@ async function startServing(
|
|||
try {
|
||||
const filesToRebuild = [...toRebuild].filter((fp) => !toRemove.has(fp))
|
||||
|
||||
ctx.allSlugs = [...new Set([...contentMap.keys(), ...toRebuild])]
|
||||
ctx.allSlugs = [...new Set([...contentMap.keys(), ...toRebuild, ...trackedAssets])]
|
||||
.filter((fp) => !toRemove.has(fp))
|
||||
.map((fp) => slugifyFilePath(path.posix.relative(argv.directory, fp) as FilePath))
|
||||
|
||||
|
@ -148,7 +161,6 @@ async function startServing(
|
|||
toRemove.clear()
|
||||
}, 250)
|
||||
}
|
||||
}
|
||||
|
||||
const watcher = chokidar.watch(".", {
|
||||
persistent: true,
|
||||
|
|
|
@ -12,7 +12,7 @@ export const Assets: QuartzEmitterPlugin = () => {
|
|||
},
|
||||
async emit({ argv, cfg }, _content, _resources, _emit): Promise<FilePath[]> {
|
||||
// glob all non MD/MDX/HTML files in content folder and copy it over
|
||||
const assetsPath = joinSegments(argv.output, "assets")
|
||||
const assetsPath = argv.output
|
||||
const fps = await glob("**", argv.directory, ["**/*.md", ...cfg.configuration.ignorePatterns])
|
||||
const res: FilePath[] = []
|
||||
for (const fp of fps) {
|
||||
|
@ -24,7 +24,7 @@ export const Assets: QuartzEmitterPlugin = () => {
|
|||
const dir = path.dirname(dest) as FilePath
|
||||
await fs.promises.mkdir(dir, { recursive: true }) // ensure dir exists
|
||||
await fs.promises.copyFile(src, dest)
|
||||
res.push(joinSegments("assets", fp) as FilePath)
|
||||
res.push(fp)
|
||||
}
|
||||
|
||||
return res
|
||||
|
|
|
@ -99,9 +99,10 @@ export const CrawlLinks: QuartzTransformerPlugin<Partial<Options> | undefined> =
|
|||
typeof node.properties.src === "string"
|
||||
) {
|
||||
if (!isAbsoluteUrl(node.properties.src)) {
|
||||
let dest = node.properties.src as RelativeURL
|
||||
const ext = path.extname(node.properties.src)
|
||||
node.properties.src =
|
||||
transformLink(joinSegments("assets", node.properties.src)) + ext
|
||||
dest = node.properties.src = transformLink(dest)
|
||||
node.properties.src = dest + ext
|
||||
}
|
||||
}
|
||||
})
|
||||
|
|
|
@ -83,7 +83,7 @@ a {
|
|||
@media all and (max-width: $fullPageWidth) {
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem;
|
||||
max-width: 800px;
|
||||
// max-width: 800px;
|
||||
}
|
||||
|
||||
& article {
|
||||
|
|
Loading…
Reference in a new issue