From 9e76b257d4be4b9e6ea7b514074ef74d8d125f4b Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Sat, 05 Aug 2023 05:35:21 +0000
Subject: [PATCH] fix mermaid initialization
---
quartz/bootstrap-cli.mjs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 04ed3a2..0094a4f 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -10,7 +10,7 @@
import { intro, isCancel, outro, select, text } from "@clack/prompts"
import { rimraf } from "rimraf"
import prettyBytes from "pretty-bytes"
-import { spawnSync } from "child_process"
+import { execSync, spawnSync } from "child_process"
import { transform as cssTransform } from "lightningcss"
const ORIGIN_NAME = "origin"
@@ -121,7 +121,7 @@
}
function gitPull(origin, branch) {
- const flags = ["-s", "recursive", "-X", "ours"]
+ const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
}
@@ -247,6 +247,9 @@
console.log(
"Pulling updates... you may need to resolve some `git` conflicts if you've made changes to components or plugins.",
)
+ execSync(
+ `git remote show upstream || git remote add upstream https://github.com/jackyzha0/quartz.git`,
+ )
gitPull(UPSTREAM_NAME, QUARTZ_SOURCE_BRANCH)
await popContentFolder(contentFolder)
console.log("Ensuring dependencies are up to date")
@@ -331,7 +334,6 @@
sourcefile,
},
write: false,
- minify: true,
bundle: true,
platform: "browser",
format: "esm",
--
Gitblit v1.10.0