Jacky Zhao
2023-08-05 9e76b257d4be4b9e6ea7b514074ef74d8d125f4b
quartz/bootstrap-cli.mjs
@@ -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,7 +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 add upstream https://github.com/jackyzha0/quartz.git`, { stdio: "ignore" })
    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")
@@ -332,7 +334,6 @@
                    sourcefile,
                  },
                  write: false,
                  minify: true,
                  bundle: true,
                  platform: "browser",
                  format: "esm",