From bbd61919342bbfe9e753f3c5109a80b7e173ecad Mon Sep 17 00:00:00 2001
From: Garrick Aden-Buie <garrick@adenbuie.com>
Date: Tue, 13 Feb 2024 17:12:14 -0500
Subject: [PATCH] Support `template.bslib.version` but throw if
 `template.bootstrap` is also set

---
 R/package.R | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/R/package.R b/R/package.R
index 415baf2ef..7f2f69a7c 100644
--- a/R/package.R
+++ b/R/package.R
@@ -23,9 +23,11 @@ as_pkgdown <- function(pkg = ".", override = list()) {
   meta <- read_meta(pkg)
   meta <- utils::modifyList(meta, override)
 
+  bs_version <- get_bootstrap_version(list(meta = meta))
+
   template_config <- find_template_config(
     package = meta$template$package,
-    bs_version = meta$template$bootstrap
+    bs_version = bs_version
   )
   meta <- modify_list(template_config, meta)
 
@@ -37,8 +39,6 @@ as_pkgdown <- function(pkg = ".", override = list()) {
   package <- desc$get_field("Package")
   version <- desc$get_field("Version")
 
-  bs_version <- check_bootstrap_version(meta$template$bootstrap, pkg)
-
   development <- meta_development(meta, version, bs_version)
 
   if (is.null(meta$destination)) {
@@ -97,6 +97,28 @@ read_desc <- function(path = ".") {
   desc::description$new(path)
 }
 
+get_bootstrap_version <- function(pkg) {
+  template_bootstrap <- pkg$meta[["template"]]$bootstrap
+  template_bslib <- pkg$meta[["template"]]$bslib$version
+
+  if (!is.null(template_bootstrap) && !is.null(template_bslib)) {
+    cli::cli_abort(
+      c(
+        sprintf(
+          "Both {.field %s} and {.field %s} are set.",
+          pkgdown_field(pkg, c("template", "bootstrap")),
+          pkgdown_field(pkg, c("template", "bslib", "version"))
+        ),
+        x = "Remove one of them from {.file {pkgdown_config_relpath(pkg)}}"
+      ),
+      call = caller_env()
+    )
+  }
+
+  version <- template_bootstrap %||% template_bslib
+  check_bootstrap_version(version, pkg)
+}
+
 check_bootstrap_version <- function(version, pkg) {
   if (is.null(version)) {
     3