Merge branch 'main' into quarto-regression-test

Author: jayhesselberth

DESCRIPTION

@@ -35,7 +35,7 @@ Imports:
     jsonlite,
     openssl,
     purrr (>= 1.0.0),
-    ragg,
+    ragg (>= 1.4.0),
     rlang (>= 1.1.4),
     rmarkdown (>= 2.27),
     tibble,
@@ -51,7 +51,7 @@ Suggests:
     gt,
     htmltools,
     htmlwidgets,
-    knitr,
+    knitr (>= 1.50),
     lifecycle,
     magick,
     methods,

NEWS.md

@@ -1,5 +1,6 @@
 # pkgdown (development version)
 
+* Option `pkgdown.internet` was removed because CDN file caching now requires an internet connection.
 * Support for math rendering using katex and mathjax was improved and now includes necessary components using CDN (#2704).
 * Articles (i.e., Rmarkdown/Quarto documents in `vignettes/articles`, created by `usethis::use_article()` and available on pkgdown sites but not included in a built package) have improved test cases (thanks to @venpopov and @ethanbass).
 * ROR IDs in `DESCRIPTION` are transformed into icons, similar to ORCID IDs. (#2850)

R/build-home-authors.R

@@ -36,7 +36,7 @@ data_authors <- function(
 
   inst_path <- path(pkg$src_path, "inst", "AUTHORS")
   if (file_exists(inst_path)) {
-    inst <- read_lines(inst_path)
+    inst <- paste(read_lines(inst_path), collapse = "\n")
   } else {
     inst <- NULL
   }

R/build-home-index.R

@@ -221,10 +221,6 @@ sidebar_section <- function(heading, bullets, class = make_slug(heading)) {
 }
 
 cran_link <- function(pkg) {
-  if (!has_internet()) {
-    return(NULL)
-  }
-
   cran_url <- paste0("https://cloud.r-project.org/package=", pkg)
   req <- httr2::request(cran_url)
   req <- req_pkgdown_cache(req)

R/build-news.R

@@ -270,10 +270,6 @@ has_news <- function(path = ".") {
 }
 
 pkg_timeline <- function(package) {
-  if (!has_internet()) {
-    return(NULL)
-  }
-
   url <- paste0("https://crandb.r-pkg.org/", package, "/all")
   req <- httr2::request(url)
   req <- httr2::req_retry(req, max_tries = 3)

R/build.R

@@ -279,18 +279,6 @@
 #'    deploy:
 #'      install_metadata: true
 #'    ```
-#'
-#' # Options
-#' Users with limited internet connectivity can disable CRAN checks by setting
-#' `options(pkgdown.internet = FALSE)`. This will also disable some features
-#' from pkgdown that requires an internet connectivity. However, if it is used
-#' to build docs for a package that requires internet connectivity in examples
-#' or vignettes, this connection is required as this option won't apply on them.
-#'
-#' Users can set a timeout for `build_site(new_process = TRUE)` with
-#' `options(pkgdown.timeout = Inf)`, which is useful to prevent stalled builds from
-#' hanging in cron jobs.
-#'
 #' @inheritParams build_articles
 #' @inheritParams build_reference
 #' @param lazy If `TRUE`, will only rebuild articles and reference pages
@@ -403,22 +391,19 @@ build_site_external <- function(
     new_process = FALSE,
     devel = devel,
     cli_colors = cli::num_ansi_colors(),
-    hyperlinks = cli::ansi_has_hyperlink_support(),
-    pkgdown_internet = has_internet()
+    hyperlinks = cli::ansi_has_hyperlink_support()
   )
   callr::r(
-    function(..., cli_colors, hyperlinks, pkgdown_internet) {
+    function(..., cli_colors, hyperlinks) {
       options(
         cli.num_colors = cli_colors,
         cli.hyperlink = hyperlinks,
-        cli.hyperlink_run = hyperlinks,
-        pkgdown.internet = pkgdown_internet
+        cli.hyperlink_run = hyperlinks
       )
       pkgdown::build_site(...)
     },
     args = args,
-    show = TRUE,
-    timeout = getOption('pkgdown.timeout', Inf)
+    show = TRUE
   )
 
   cli::cli_rule(

R/utils.R

@@ -82,10 +82,6 @@ writing_file <- function(path, show) {
   )
 }
 
-has_internet <- function() {
-  getOption("pkgdown.internet", default = TRUE)
-}
-
 modify_list <- function(x, y) {
   if (is.null(x)) {
     return(y)

man/build_site.Rd

@@ -27,39 +27,6 @@
 
     <span class="co">## <span style="color: #BB0000;">X</span></span>
 
-# build_article yields useful error if R fails
-
-    Code
-      build_article("test", pkg)
-    Message
-      Reading vignettes/test.Rmd
-    Condition
-      Error in `build_article()`:
-      ! Failed to render 'vignettes/test.Rmd'.
-      x Quitting from test.Rmd:4-9 [unnamed-chunk-1]
-      Caused by error:
-      ! Error!
-
----
-
-    Code
-      summary(expect_error(build_article("test", pkg)))
-    Message
-      Reading vignettes/test.Rmd
-    Output
-      <error/rlang_error>
-      Error in `build_article()`:
-      ! Failed to render 'vignettes/test.Rmd'.
-      x Quitting from test.Rmd:4-9 [unnamed-chunk-1]
-      Caused by error:
-      ! Error!
-      ---
-      Backtrace:
-          x
-       1. \-global f()
-       2.   \-global g()
-       3.     \-global h()
-
 # build_article copies image files in subdirectories
 
     Code

tests/testthat/_snaps/build-article.md

@@ -0,0 +1,33 @@
+# build_article yields useful error if R fails
+
+    Code
+      build_article("test", pkg)
+    Message
+      Reading vignettes/test.Rmd
+    Condition
+      Error in `build_article()`:
+      ! Failed to render 'vignettes/test.Rmd'.
+      x Quitting from test.Rmd:4-10 [unnamed-chunk-1]
+      Caused by error:
+      ! Error!
+
+---
+
+    Code
+      summary(expect_error(build_article("test", pkg)))
+    Message
+      Reading vignettes/test.Rmd
+    Output
+      <error/rlang_error>
+      Error in `build_article()`:
+      ! Failed to render 'vignettes/test.Rmd'.
+      x Quitting from test.Rmd:4-10 [unnamed-chunk-1]
+      Caused by error:
+      ! Error!
+      ---
+      Backtrace:
+          x
+       1. \-global f()
+       2.   \-global g()
+       3.     \-global h()
+