| | |
| | | } |
| | | |
| | | 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" }) |
| | | } |
| | | |
| | |
| | | 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") |
| | |
| | | sourcefile, |
| | | }, |
| | | write: false, |
| | | minify: true, |
| | | bundle: true, |
| | | platform: "browser", |
| | | format: "esm", |