From ebf3263b7efacc9ac499f3f1f1bbc91451899ae0 Mon Sep 17 00:00:00 2001
From: Jacky Zhao <j.zhao2k19@gmail.com>
Date: Wed, 09 Aug 2023 16:10:40 +0000
Subject: [PATCH] update npx quartz update script
---
/dev/null | 0
content/features/upcoming features.md | 24 ++++++++++++++++++++++--
quartz/bootstrap-cli.mjs | 2 +-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/content/features/no-code layout configuration.md b/content/features/no-code layout configuration.md
deleted file mode 100644
index e69de29..0000000
--- a/content/features/no-code layout configuration.md
+++ /dev/null
diff --git a/content/features/upcoming features.md b/content/features/upcoming features.md
index 8ab7520..40b97cf 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 cfb01f1..d00a242 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -129,7 +129,7 @@
}
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" })
}
--
Gitblit v1.10.0