From 59b58076016c5e5f09f16ab0395fed02e2ebb72e Mon Sep 17 00:00:00 2001
From: wasita <wasita.mahaphanit.gr@dartmouth.edu>
Date: Wed, 04 Mar 2026 15:42:49 +0000
Subject: [PATCH] 🐛 fix(cli): use 'gray' instead of 'grey' in styleText calls (#2321)
---
quartz/cli/handlers.js | 86 ++++++++++++++++++++++++++-----------------
1 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/quartz/cli/handlers.js b/quartz/cli/handlers.js
index c41bafc..eb340d0 100644
--- a/quartz/cli/handlers.js
+++ b/quartz/cli/handlers.js
@@ -1,11 +1,11 @@
import { promises } from "fs"
import path from "path"
import esbuild from "esbuild"
-import chalk from "chalk"
+import { styleText } from "util"
import { sassPlugin } from "esbuild-sass-plugin"
import fs from "fs"
import { intro, outro, select, text } from "@clack/prompts"
-import { rimraf } from "rimraf"
+import { rm } from "fs/promises"
import chokidar from "chokidar"
import prettyBytes from "pretty-bytes"
import { execSync, spawnSync } from "child_process"
@@ -48,7 +48,7 @@
*/
export async function handleCreate(argv) {
console.log()
- intro(chalk.bgGreen.black(` Quartz v${version} `))
+ intro(styleText(["bgGreen", "black"], ` Quartz v${version} `))
const contentFolder = resolveContentPath(argv.directory)
let setupStrategy = argv.strategy?.toLowerCase()
let linkResolutionStrategy = argv.links?.toLowerCase()
@@ -61,12 +61,16 @@
// Error handling
if (!sourceDirectory) {
outro(
- chalk.red(
- `Setup strategies (arg '${chalk.yellow(
+ styleText(
+ "red",
+ `Setup strategies (arg '${styleText(
+ "yellow",
`-${CreateArgv.strategy.alias[0]}`,
- )}') other than '${chalk.yellow(
+ )}') other than '${styleText(
+ "yellow",
"new",
- )}' require content folder argument ('${chalk.yellow(
+ )}' require content folder argument ('${styleText(
+ "yellow",
`-${CreateArgv.source.alias[0]}`,
)}') to be set`,
),
@@ -75,19 +79,23 @@
} else {
if (!fs.existsSync(sourceDirectory)) {
outro(
- chalk.red(
- `Input directory to copy/symlink 'content' from not found ('${chalk.yellow(
+ styleText(
+ "red",
+ `Input directory to copy/symlink 'content' from not found ('${styleText(
+ "yellow",
sourceDirectory,
- )}', invalid argument "${chalk.yellow(`-${CreateArgv.source.alias[0]}`)})`,
+ )}', invalid argument "${styleText("yellow", `-${CreateArgv.source.alias[0]}`)})`,
),
)
process.exit(1)
} else if (!fs.lstatSync(sourceDirectory).isDirectory()) {
outro(
- chalk.red(
- `Source directory to copy/symlink 'content' from is not a directory (found file at '${chalk.yellow(
+ styleText(
+ "red",
+ `Source directory to copy/symlink 'content' from is not a directory (found file at '${styleText(
+ "yellow",
sourceDirectory,
- )}', invalid argument ${chalk.yellow(`-${CreateArgv.source.alias[0]}`)}")`,
+ )}', invalid argument ${styleText("yellow", `-${CreateArgv.source.alias[0]}`)}")`,
),
)
process.exit(1)
@@ -119,7 +127,7 @@
if (contentStat.isSymbolicLink()) {
await fs.promises.unlink(contentFolder)
} else {
- await rimraf(contentFolder)
+ await rm(contentFolder, { recursive: true, force: true })
}
}
@@ -229,7 +237,7 @@
argv.watch = true
}
- console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
+ console.log(`\n${styleText(["bgGreen", "black"], ` Quartz v${version} `)} \n`)
const ctx = await esbuild.context({
entryPoints: [fp],
outfile: cacheFile,
@@ -304,13 +312,13 @@
}
if (cleanupBuild) {
- console.log(chalk.yellow("Detected a source code change, doing a hard rebuild..."))
+ console.log(styleText("yellow", "Detected a source code change, doing a hard rebuild..."))
await cleanupBuild()
}
const result = await ctx.rebuild().catch((err) => {
- console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
- console.log(`Reason: ${chalk.grey(err)}`)
+ console.error(`${styleText("red", "Couldn't parse Quartz configuration:")} ${fp}`)
+ console.log(`Reason: ${styleText("gray", err)}`)
process.exit(1)
})
release()
@@ -348,7 +356,8 @@
const server = http.createServer(async (req, res) => {
if (argv.baseDir && !req.url?.startsWith(argv.baseDir)) {
console.log(
- chalk.red(
+ styleText(
+ "red",
`[404] ${req.url} (warning: link outside of site, this is likely a Quartz bug)`,
),
)
@@ -383,8 +392,10 @@
})
const status = res.statusCode
const statusString =
- status >= 200 && status < 300 ? chalk.green(`[${status}]`) : chalk.red(`[${status}]`)
- console.log(statusString + chalk.grey(` ${argv.baseDir}${req.url}`))
+ status >= 200 && status < 300
+ ? styleText("green", `[${status}]`)
+ : styleText("red", `[${status}]`)
+ console.log(statusString + styleText("gray", ` ${argv.baseDir}${req.url}`))
release()
}
@@ -393,7 +404,10 @@
res.writeHead(302, {
Location: newFp,
})
- console.log(chalk.yellow("[302]") + chalk.grey(` ${argv.baseDir}${req.url} -> ${newFp}`))
+ console.log(
+ styleText("yellow", "[302]") +
+ styleText("gray", ` ${argv.baseDir}${req.url} -> ${newFp}`),
+ )
res.end()
}
@@ -443,7 +457,8 @@
const wss = new WebSocketServer({ port: argv.wsPort })
wss.on("connection", (ws) => connections.push(ws))
console.log(
- chalk.cyan(
+ styleText(
+ "cyan",
`Started a Quartz server listening at http://localhost:${argv.port}${argv.baseDir}`,
),
)
@@ -467,7 +482,7 @@
.on("change", () => build(clientRefresh))
.on("unlink", () => build(clientRefresh))
- console.log(chalk.grey("hint: exit with ctrl+c"))
+ console.log(styleText("gray", "hint: exit with ctrl+c"))
}
}
@@ -477,7 +492,7 @@
*/
export async function handleUpdate(argv) {
const contentFolder = resolveContentPath(argv.directory)
- console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
+ console.log(`\n${styleText(["bgGreen", "black"], ` Quartz v${version} `)} \n`)
console.log("Backing up your content")
execSync(
`git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
@@ -490,7 +505,7 @@
try {
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occurred above while pulling updates."))
+ console.log(styleText("red", "An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
@@ -517,9 +532,9 @@
const res = spawnSync("npm", ["i"], opts)
if (res.status === 0) {
- console.log(chalk.green("Done!"))
+ console.log(styleText("green", "Done!"))
} else {
- console.log(chalk.red("An error occurred above while installing dependencies."))
+ console.log(styleText("red", "An error occurred above while installing dependencies."))
}
}
@@ -538,14 +553,14 @@
*/
export async function handleSync(argv) {
const contentFolder = resolveContentPath(argv.directory)
- console.log(chalk.bgGreen.black(`\n Quartz v${version} \n`))
+ console.log(`\n${styleText(["bgGreen", "black"], ` Quartz v${version} `)}\n`)
console.log("Backing up your content")
if (argv.commit) {
const contentStat = await fs.promises.lstat(contentFolder)
if (contentStat.isSymbolicLink()) {
const linkTarg = await fs.promises.readlink(contentFolder)
- console.log(chalk.yellow("Detected symlink, trying to dereference before committing"))
+ console.log(styleText("yellow", "Detected symlink, trying to dereference before committing"))
// stash symlink file
await stashContentFolder(contentFolder)
@@ -580,7 +595,7 @@
try {
gitPull(ORIGIN_NAME, QUARTZ_SOURCE_BRANCH)
} catch {
- console.log(chalk.red("An error occurred above while pulling updates."))
+ console.log(styleText("red", "An error occurred above while pulling updates."))
await popContentFolder(contentFolder)
return
}
@@ -589,14 +604,17 @@
await popContentFolder(contentFolder)
if (argv.push) {
console.log("Pushing your changes")
- const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], {
+ const currentBranch = execSync("git rev-parse --abbrev-ref HEAD").toString().trim()
+ const res = spawnSync("git", ["push", "-uf", ORIGIN_NAME, currentBranch], {
stdio: "inherit",
})
if (res.status !== 0) {
- console.log(chalk.red(`An error occurred above while pushing to remote ${ORIGIN_NAME}.`))
+ console.log(
+ styleText("red", `An error occurred above while pushing to remote ${ORIGIN_NAME}.`),
+ )
return
}
}
- console.log(chalk.green("Done!"))
+ console.log(styleText("green", "Done!"))
}
--
Gitblit v1.10.0