From 6457496b4b8222d95d9b5ab47e8eda62d7241739 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Thu, 03 Aug 2023 06:42:49 +0000
Subject: [PATCH] readme fixes, force
---
quartz/bootstrap-cli.mjs | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 475e624..4013a20 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -11,7 +11,9 @@
import { rimraf } from "rimraf"
import prettyBytes from "pretty-bytes"
import { spawnSync } from "child_process"
+import { transform as cssTransform } from "lightningcss"
+const ORIGIN_NAME = "origin"
const UPSTREAM_NAME = "upstream"
const QUARTZ_SOURCE_BRANCH = "v4-alpha"
const cwd = process.cwd()
@@ -48,12 +50,6 @@
default: true,
describe: "push updates to your Quartz fork",
},
- force: {
- boolean: true,
- alias: ["f"],
- default: true,
- describe: "whether to apply the --force flag to git commands",
- },
pull: {
boolean: true,
default: true,
@@ -82,8 +78,8 @@
bundleInfo: {
boolean: true,
default: false,
- describe: "show detailed bundle information"
- }
+ describe: "show detailed bundle information",
+ },
}
function escapePath(fp) {
@@ -114,6 +110,7 @@
}
async function popContentFolder(contentFolder) {
+ await fs.promises.rm(contentFolder, { force: true, recursive: true })
await fs.promises.cp(contentCacheFolder, contentFolder, {
force: true,
recursive: true,
@@ -123,6 +120,13 @@
await fs.promises.rm(contentCacheFolder, { force: true, recursive: true })
}
+function gitPull(origin, branch) {
+ spawnSync("git", ["fetch", origin, branch], { stdio: "inherit" })
+ spawnSync("git", ["checkout", `${origin}/${branch}`, "--", ":(exclude)content"], {
+ stdio: "inherit",
+ }).error
+}
+
yargs(hideBin(process.argv))
.scriptName("quartz")
.version(version)
@@ -245,8 +249,10 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["pull", UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
await popContentFolder(contentFolder)
+ console.log("Ensuring dependencies are up to date")
+ spawnSync("npm", ["i"], { stdio: "inherit" })
console.log(chalk.green("Done!"))
})
.command("sync", "Sync your Quartz to and from GitHub.", SyncArgv, async (argv) => {
@@ -268,16 +274,13 @@
console.log(
"Pulling updates from your repository. You may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
- spawnSync("git", ["pull", "origin", QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
+ gitPull(ORIGIN_NAME, QUARTZ_SOURCE_BRANCH)
}
await popContentFolder(contentFolder)
if (argv.push) {
console.log("Pushing your changes")
- const args = argv.force
- ? ["push", "-f", "origin", QUARTZ_SOURCE_BRANCH]
- : ["push", "origin", QUARTZ_SOURCE_BRANCH]
- spawnSync("git", args, { stdio: "inherit" })
+ spawnSync("git", ["push", "-f", ORIGIN_NAME, QUARTZ_SOURCE_BRANCH], { stdio: "inherit" })
}
console.log(chalk.green("Done!"))
@@ -300,6 +303,15 @@
plugins: [
sassPlugin({
type: "css-text",
+ cssImports: true,
+ async transform(css) {
+ const { code } = cssTransform({
+ filename: "style.css",
+ code: Buffer.from(css),
+ minify: true,
+ })
+ return code.toString()
+ },
}),
{
name: "inline-script-loader",
@@ -339,9 +351,6 @@
.catch((err) => {
console.error(`${chalk.red("Couldn't parse Quartz configuration:")} ${fp}`)
console.log(`Reason: ${chalk.grey(err)}`)
- console.log(
- "hint: make sure all the required dependencies are installed (run `npm install`)",
- )
process.exit(1)
})
@@ -351,9 +360,9 @@
console.log(
`Successfully transpiled ${Object.keys(meta.inputs).length} files (${prettyBytes(
meta.bytes,
- )})`)
- console.log(await esbuild.analyzeMetafile(result.metafile, { color: true })
+ )})`,
)
+ console.log(await esbuild.analyzeMetafile(result.metafile, { color: true }))
}
const { default: buildQuartz } = await import(cacheFile)
--
Gitblit v1.10.0