From fd7c33c5372dd61283fc44f4dccbff0e71fcbf5b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 23 Jul 2023 18:19:15 +0000
Subject: [PATCH] style fixes for search bar and title on mobile
---
quartz/build.ts | 96 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 80 insertions(+), 16 deletions(-)
diff --git a/quartz/build.ts b/quartz/build.ts
index 6926d68..df83f6e 100644
--- a/quartz/build.ts
+++ b/quartz/build.ts
@@ -1,8 +1,8 @@
-import 'source-map-support/register.js'
+import "source-map-support/register.js"
import path from "path"
import { PerfTimer } from "./perf"
import { rimraf } from "rimraf"
-import { globby } from "globby"
+import { globby, isGitIgnored } from "globby"
import chalk from "chalk"
import http from "http"
import serveHandler from "serve-handler"
@@ -11,6 +11,9 @@
import { emitContent } from "./processors/emit"
import cfg from "../quartz.config"
import { FilePath } from "./path"
+import chokidar from "chokidar"
+import { ProcessedContent } from "./plugins/vfile"
+import WebSocket, { WebSocketServer } from "ws"
interface Argv {
directory: string
@@ -26,46 +29,107 @@
const output = argv.output
const pluginCount = Object.values(cfg.plugins).flat().length
- const pluginNames = (key: 'transformers' | 'filters' | 'emitters') => cfg.plugins[key].map(plugin => plugin.name)
+ const pluginNames = (key: "transformers" | "filters" | "emitters") =>
+ cfg.plugins[key].map((plugin) => plugin.name)
if (argv.verbose) {
console.log(`Loaded ${pluginCount} plugins`)
- console.log(` Transformers: ${pluginNames('transformers').join(", ")}`)
- console.log(` Filters: ${pluginNames('filters').join(", ")}`)
- console.log(` Emitters: ${pluginNames('emitters').join(", ")}`)
+ console.log(` Transformers: ${pluginNames("transformers").join(", ")}`)
+ console.log(` Filters: ${pluginNames("filters").join(", ")}`)
+ console.log(` Emitters: ${pluginNames("emitters").join(", ")}`)
}
// clean
- perf.addEvent('clean')
+ perf.addEvent("clean")
await rimraf(output)
- console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince('clean')}`)
+ console.log(`Cleaned output directory \`${output}\` in ${perf.timeSince("clean")}`)
// glob
- perf.addEvent('glob')
- const fps = await globby('**/*.md', {
+ perf.addEvent("glob")
+ const fps = await globby("**/*.md", {
cwd: argv.directory,
ignore: cfg.configuration.ignorePatterns,
gitignore: true,
})
- console.log(`Found ${fps.length} input files from \`${argv.directory}\` in ${perf.timeSince('glob')}`)
+ console.log(
+ `Found ${fps.length} input files from \`${argv.directory}\` in ${perf.timeSince("glob")}`,
+ )
- const filePaths = fps.map(fp => `${argv.directory}${path.sep}${fp}` as FilePath)
- const parsedFiles = await parseMarkdown(cfg.plugins.transformers, argv.directory, filePaths, argv.verbose)
+ const filePaths = fps.map((fp) => `${argv.directory}${path.sep}${fp}` as FilePath)
+ const parsedFiles = await parseMarkdown(
+ cfg.plugins.transformers,
+ argv.directory,
+ filePaths,
+ argv.verbose,
+ )
const filteredContent = filterContent(cfg.plugins.filters, parsedFiles, argv.verbose)
- await emitContent(argv.directory, output, cfg, filteredContent, argv.verbose)
+ await emitContent(argv.directory, output, cfg, filteredContent, argv.serve, argv.verbose)
console.log(chalk.green(`Done processing ${fps.length} files in ${perf.timeSince()}`))
if (argv.serve) {
+ const wss = new WebSocketServer({ port: 3001 })
+ const connections: WebSocket[] = []
+ wss.on("connection", (ws) => connections.push(ws))
+
+ const ignored = await isGitIgnored()
+ const contentMap = new Map<FilePath, ProcessedContent>()
+ for (const content of parsedFiles) {
+ const [_tree, vfile] = content
+ contentMap.set(vfile.data.filePath!, content)
+ }
+
+ async function rebuild(fp: string, action: "add" | "change" | "unlink") {
+ perf.addEvent("rebuild")
+ if (!ignored(fp)) {
+ console.log(chalk.yellow(`Detected change in ${fp}, rebuilding...`))
+ const fullPath = `${argv.directory}${path.sep}${fp}` as FilePath
+ if (action === "add" || action === "change") {
+ const [parsedContent] = await parseMarkdown(
+ cfg.plugins.transformers,
+ argv.directory,
+ [fullPath],
+ argv.verbose,
+ )
+ contentMap.set(fullPath, parsedContent)
+ } else if (action === "unlink") {
+ contentMap.delete(fullPath)
+ }
+
+ await rimraf(output)
+ const parsedFiles = [...contentMap.values()]
+ const filteredContent = filterContent(cfg.plugins.filters, parsedFiles, argv.verbose)
+ await emitContent(argv.directory, output, cfg, filteredContent, argv.serve, argv.verbose)
+ console.log(chalk.green(`Done rebuilding in ${perf.timeSince("rebuild")}`))
+ connections.forEach((conn) => conn.send("rebuild"))
+ }
+ }
+
+ const watcher = chokidar.watch(".", {
+ persistent: true,
+ cwd: argv.directory,
+ ignoreInitial: true,
+ })
+
+ watcher
+ .on("add", (fp) => rebuild(fp, "add"))
+ .on("change", (fp) => rebuild(fp, "change"))
+ .on("unlink", (fp) => rebuild(fp, "unlink"))
+
const server = http.createServer(async (req, res) => {
await serveHandler(req, res, {
public: output,
directoryListing: false,
})
const status = res.statusCode
- const statusString = status === 200 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
+ const statusString =
+ status >= 200 && status < 300
+ ? chalk.green(`[${status}]`)
+ : status >= 300 && status < 400
+ ? chalk.yellow(`[${status}]`)
+ : chalk.red(`[${status}]`)
console.log(statusString + chalk.grey(` ${req.url}`))
})
server.listen(argv.port)
console.log(chalk.cyan(`Started a Quartz server listening at http://localhost:${argv.port}`))
- console.log('hint: exit with ctrl+c')
+ console.log("hint: exit with ctrl+c")
}
}
--
Gitblit v1.10.0