From a3e4c86a4cf18e31fe5b65d57ce120174c9f6aee Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sun, 16 Jul 2023 06:05:17 +0000
Subject: [PATCH] fix ci, disable strict path type checks by default
---
quartz/bootstrap-cli.mjs | 43 ++++++++++++++++++++++++++++++-------------
1 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 92f88bf..bb83fe0 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -9,6 +9,7 @@
import fs from 'fs'
import { intro, isCancel, outro, select, text } from '@clack/prompts'
import { rimraf } from 'rimraf'
+import prettyBytes from 'pretty-bytes'
const cacheFile = "./.quartz-cache/transpiled-build.mjs"
const fp = "./quartz/build.ts"
@@ -45,6 +46,14 @@
}
}
+function escapePath(fp) {
+ return fp
+ .replace(/\\ /g, " ") // unescape spaces
+ .replace(/^".*"$/, "$1")
+ .replace(/^'.*"$/, "$1")
+ .trim()
+}
+
yargs(hideBin(process.argv))
.scriptName("quartz")
.version(version)
@@ -69,30 +78,29 @@
}
async function rmContentFolder() {
- if (fs.existsSync(contentFolder)) {
- const contentStat = await fs.promises.lstat(contentFolder)
+ const contentStat = await fs.promises.lstat(contentFolder)
+ if (contentStat) {
if (contentStat.isSymbolicLink()) {
await fs.promises.unlink(contentFolder)
} else {
await rimraf(contentFolder)
}
}
-
- await fs.promises.mkdir(contentFolder)
}
if (setupStrategy === 'copy' || setupStrategy === 'symlink') {
- const originalFolder = await text({
+ const originalFolder = escapePath(await text({
message: "Enter the full path to existing content folder",
placeholder: 'On most terminal emulators, you can drag and drop a folder into the window and it will paste the full path',
validate(fp) {
- if (!fs.existsSync(fp)) {
+ const fullPath = escapePath(fp)
+ if (!fs.existsSync(fullPath)) {
return "The given path doesn't exist"
- } else if (!fs.lstatSync(fp).isDirectory()) {
+ } else if (!fs.lstatSync(fullPath).isDirectory()) {
return "The given path is not a folder"
}
}
- })
+ }))
if (isCancel(originalFolder)) {
outro(chalk.red("Exiting"))
@@ -101,14 +109,15 @@
await rmContentFolder()
if (setupStrategy === 'copy') {
- await fs.promises.cp(originalFolder, contentFolder)
+ await fs.promises.cp(originalFolder, contentFolder, { recursive: true })
} else if (setupStrategy === 'symlink') {
- await fs.promises.symlink(originalFolder, contentFolder)
+ await fs.promises.symlink(originalFolder, contentFolder, 'dir')
}
} else if (setupStrategy === 'new') {
await rmContentFolder()
- await fs.promises.writeFile(path.join(contentFolder, "index.md"),
-`---
+ await fs.promises.mkdir(contentFolder)
+ await fs.promises.writeFile(path.join(contentFolder, "index.md"),
+ `---
title: Welcome to Quartz
---
@@ -125,7 +134,7 @@
`)
})
.command('build', 'Build Quartz into a bundle of static HTML files', BuildArgv, async (argv) => {
- await esbuild.build({
+ const result = await esbuild.build({
entryPoints: [fp],
outfile: path.join("quartz", cacheFile),
bundle: true,
@@ -135,6 +144,8 @@
jsx: "automatic",
jsxImportSource: "preact",
packages: "external",
+ metafile: true,
+ sourcemap: true,
plugins: [
sassPlugin({
type: 'css-text',
@@ -178,6 +189,12 @@
process.exit(1)
})
+ if (argv.verbose) {
+ const outputFileName = 'quartz/.quartz-cache/transpiled-build.mjs'
+ const meta = result.metafile.outputs[outputFileName]
+ console.log(chalk.gray(`[debug] Successfully transpiled ${Object.keys(meta.inputs).length} files (${prettyBytes(meta.bytes)})`))
+ }
+
const { default: init } = await import(cacheFile)
init(argv, version)
})
--
Gitblit v1.10.0