Merge branch 'main' into examplesIf

etiennebacher · Apr 5, 2024 · 42f8bee · 42f8bee
2 parents 29b3cb8 + 9640d70
commit 42f8bee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/R/render_docs.R b/R/render_docs.R
@@ -68,8 +68,6 @@ render_docs <- function(path = ".", verbose = FALSE, parallel = FALSE, freeze =
       fs::file_delete(docs_files)
     }
 
-    .add_gitignore("_quarto/", path = path)
-    .add_gitignore("!_quarto/_freeze/", path = path)
   } else {
     docs_dir <- fs::path_join(c(path, "docs"))
   }

diff --git a/R/settings_quarto_website.R b/R/settings_quarto_website.R
@@ -62,7 +62,8 @@
         fs::path_join(c(path, "_quarto/man")),
         pattern = "\\.qmd$", full.names = TRUE)
 
-    fn_man <- gsub(".*_quarto.", "", fn_man)
+    # issue #266: add word boundary check
+    fn_man <- gsub(".*\\b_quarto.", "", fn_man)
     fn_vignettes <- gsub(".*_quarto.", "", fn_vignettes)
 
     yml <- paste(sidebar, collapse = "\n")

diff --git a/R/setup_docs.R b/R/setup_docs.R
@@ -109,7 +109,11 @@ setup_docs <- function(tool, path = ".", overwrite = FALSE) {
   .add_rbuildignore("^docs$", path = path)
   .add_rbuildignore("^altdoc$", path = path)
   .add_gitignore("altdoc/freeze.rds", path = path)
-  if (tool == "quarto_website") .add_rbuildignore("^_quarto$", path = path)
+  if (tool == "quarto_website") {
+    .add_rbuildignore("^_quarto$", path = path)
+    .add_gitignore("_quarto/*", path = path)
+    .add_gitignore("!_quarto/_freeze/", path = path)
+  }
 
   cli::cli_alert_info("Importing default settings file(s) to `altdoc/`")