From ebf3263b7efacc9ac499f3f1f1bbc91451899ae0 Mon Sep 17 00:00:00 2001 From: Jacky Zhao Date: Wed, 9 Aug 2023 09:10:40 -0700 Subject: [PATCH] update npx quartz update script --- .../features/no-code layout configuration.md | 0 content/features/upcoming features.md | 24 +++++++++++++++++-- quartz/bootstrap-cli.mjs | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) delete mode 100644 content/features/no-code layout configuration.md diff --git a/content/features/no-code layout configuration.md b/content/features/no-code layout configuration.md deleted file mode 100644 index e69de29b..00000000 diff --git a/content/features/upcoming features.md b/content/features/upcoming features.md index 8ab75202..40b97cf1 100644 --- a/content/features/upcoming features.md +++ b/content/features/upcoming features.md @@ -2,14 +2,34 @@ draft: true --- -## high priority +## todo +- docs for making plugins +- nested tags showing duplicate +- back button with anchors / popovers + spa is broken +- search should be fast for large repos +- debounce cfg rebuild on large repos + - investigate content rebuild triggering multiple times even when debounced, causing an esbuild deadlock +- dereference symlink for npx quartz sync +- test/fix with subpath +- fix docs with deploy from github +- write feature docs + - callouts + - folder and tag listings + - mermaid diagrams + - rss + - spa-routing + - table of contents + - darkmode + - frontmatter parsing + +## high priority backlog - block links: https://help.obsidian.md/Linking+notes+and+files/Internal+links#Link+to+a+block+in+a+note - note/header/block transcludes: https://help.obsidian.md/Linking+notes+and+files/Embedding+files - static dead link detection - docker support -## misc +## misc backlog - breadcrumbs component - filetree component diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs index cfb01f15..d00a2423 100755 --- a/quartz/bootstrap-cli.mjs +++ b/quartz/bootstrap-cli.mjs @@ -129,7 +129,7 @@ async function popContentFolder(contentFolder) { } function gitPull(origin, branch) { - const flags = ["-s", "recursive", "-X", "ours", "--no-edit"] + const flags = ["--no-rebase", "--autostash", "-s", "recursive", "-X", "ours", "--no-edit"] spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" }) }