Check for and fix fs functions

.lintr.R

@@ -15,6 +15,16 @@ linters <- list(lintr::undesirable_function_linter(
     "cli_alert_warning" = "use cli::cli_inform()",
     # fs
     "file.path" = "use path()",
+    "dir" = "use dir_ls()",
+    "dir.create" = "use dir_create()",
+    "file.copy" = "use file_copy()",
+    "file.create" = "use file_create()",
+    "file.exists" = "use file_exists()",
+    "file.info" = "use file_info()",
+    "normalizePath" = "use path_real()",
+    "unlink" = "use file_delete()",
+    "basename" = "use path_file()",
+    "dirname" = "use path_dir()",
     # i/o
     "readLines" = "use read_lines()",
     "writeLines" = "use write_lines()"

R/build-favicons.R

@@ -84,8 +84,7 @@ build_favicons <- function(pkg = ".", overwrite = FALSE) {
     cli::cli_abort("API request failed.", .internal = TRUE)
   }
 
-  tmp <- tempfile()
-  on.exit(unlink(tmp))
+  tmp <- withr::local_tempdir()
   result <- httr::RETRY(
     "GET",
     result$favicon$package_url,
@@ -120,5 +119,5 @@ copy_favicons <- function(pkg = ".") {
 has_favicons <- function(pkg = ".") {
   pkg <- as_pkgdown(pkg)
 
-  file.exists(path(pkg$src_path, "pkgdown", "favicon"))
+  file_exists(path(pkg$src_path, "pkgdown", "favicon"))
 }

R/build-home-index.R

@@ -64,7 +64,7 @@ data_home_sidebar <- function(pkg = ".", call = caller_env()) {
   html_path <- path(pkg$src_path, pkg$meta$home$sidebar$html)
 
   if (length(html_path)) {
-    if (!file.exists(html_path)) {
+    if (!file_exists(html_path)) {
       rel_html_path <- path_rel(html_path, pkg$src_path)
       config_abort(
         pkg,

R/build-home-md.R

@@ -38,7 +38,7 @@ render_md <- function(pkg, filename) {
   cli::cli_inform("Reading {src_path(path_rel(filename, pkg$src_path))}")
 
   body <- markdown_body(filename, strip_header = TRUE)
-  path <- path_ext_set(basename(filename), "html")
+  path <- path_ext_set(path_file(filename), "html")
 
   render_page(pkg, "title-body",
     data = list(

R/package.R

@@ -311,7 +311,7 @@ package_vignettes <- function(path = ".") {
     description = desc,
     depth = dir_depth(file_out)
   )
-  out[order(basename(out$file_out)), ]
+  out[order(path_file(out$file_out)), ]
 }
 
 find_template_config <- function(package,

R/pkgdown.R

@@ -49,9 +49,6 @@ local_pkgdown_site <- function(path = NULL, meta = NULL, env = parent.frame()) {
   }
   pkg <- as_pkgdown(path, meta)
   pkg$dst_path <- withr::local_tempdir(.local_envir = env)
-
-  withr::defer(unlink(pkg$dst_path, recursive = TRUE), envir = env)
-
   pkg
 }
 

R/rmarkdown.R

@@ -72,10 +72,10 @@ render_rmarkdown <- function(pkg, input, output, ..., seed = NULL, copy_images =
 
     # temporarily copy the rendered html into the input path directory and scan
     # again for additional external resources that may be been included by R code
-    tempfile_in_input_dir <- file_temp(ext = "html", tmp_dir = path_dir(input_path))
-    file_copy(path, tempfile_in_input_dir)
-    withr::defer(unlink(tempfile_in_input_dir))
-    ext_post <- rmarkdown::find_external_resources(tempfile_in_input_dir)
+    tempfile <- path(path_dir(input_path), "--find-assets.html")
+    withr::defer(try(file_delete(tempfile)))
+    file_copy(path, tempfile)
+    ext_post <- rmarkdown::find_external_resources(tempfile)
 
     ext <- rbind(ext_src, ext_post)
     ext <- ext[!duplicated(ext$path), ]

R/theme.R

@@ -27,7 +27,7 @@ build_bslib <- function(pkg = ".") {
 }
 
 data_deps <- function(pkg, depth) {
-  if (!file.exists(data_deps_path(pkg))) {
+  if (!file_exists(data_deps_path(pkg))) {
     cli::cli_abort(
       "Run {.fn pkgdown::init_site} first.",
       call = caller_env()

R/utils-fs.R

@@ -72,7 +72,7 @@ out_of_date <- function(source, target) {
     )
   }
 
-  file.info(source)$mtime > file.info(target)$mtime
+  file_mtime(source) > file_mtime(target)
 }
 
 # Path helpers ------------------------------------------------------------

tests/testthat/test-build-articles.R

@@ -55,7 +55,7 @@ test_that("articles don't include header-attrs.js script", {
   html <- xml2::read_html(path)
   js <- xpath_attr(html, ".//body//script", "src")
   # included for pandoc 2.7.3 - 2.9.2.1 improve accessibility
-  js <- js[basename(js) != "empty-anchor.js"]
+  js <- js[path_file(js) != "empty-anchor.js"]
   expect_equal(js, character())
 })
 
@@ -90,8 +90,8 @@ test_that("html widgets get needed css/js", {
   css <- xpath_attr(html, ".//body//link", "href")
   js <- xpath_attr(html, ".//body//script", "src")
 
-  expect_true("diffviewer.css" %in% basename(css))
-  expect_true("diffviewer.js" %in% basename(js))
+  expect_true("diffviewer.css" %in% path_file(css))
+  expect_true("diffviewer.js" %in% path_file(js))
 })
 
 test_that("can override options with _output.yml", {
@@ -163,8 +163,8 @@ test_that("articles in vignettes/articles/ are unnested into articles/", {
   suppressMessages(path <- build_article("articles/nested", pkg))
 
   expect_equal(
-    normalizePath(path),
-    normalizePath(path(pkg$dst_path, "articles", "nested.html"))
+    path_real(path),
+    path_real(path(pkg$dst_path, "articles", "nested.html"))
   )
 
   # Check automatic redirect from articles/articles/foo.html -> articles/foo.html
@@ -250,7 +250,7 @@ test_that("check doesn't include getting started vignette", {
   pkg <- local_pkgdown_site(test_path("assets/articles-resources"))
   getting_started <- path(pkg$src_path, "vignettes", paste0(pkg$package, ".Rmd"))
   file_create(getting_started)
-  withr::defer(unlink(getting_started))
+  withr::defer(file_delete(getting_started))
 
   pkg <- local_pkgdown_site(test_path("assets/articles-resources"), meta = "
     articles:

tests/testthat/test-build-home.R

@@ -6,7 +6,7 @@ test_that("intermediate files cleaned up automatically", {
   pkg <- local_pkgdown_site(test_path("assets/home-index-rmd"))
   suppressMessages(build_home(pkg))
 
-  expect_setequal(dir(pkg$src_path), c("DESCRIPTION", "index.Rmd"))
+  expect_setequal(path_file(dir_ls(pkg$src_path)), c("DESCRIPTION", "index.Rmd"))
 })
 
 test_that("intermediate files cleaned up automatically", {
@@ -16,7 +16,7 @@ test_that("intermediate files cleaned up automatically", {
   suppressMessages(build_home(pkg))
 
   expect_setequal(
-    dir(pkg$src_path),
+    path_file(dir_ls(pkg$src_path)),
     c("NAMESPACE", "DESCRIPTION", "README.md", "README.Rmd")
   )
 })

tests/testthat/test-build-reference.R

@@ -23,7 +23,7 @@ test_that("examples_env sets width", {
     code:
       width: 50
   ")
-  dir.create(path(pkg$dst_path, "reference"), recursive = TRUE)
+  dir_create(path(pkg$dst_path, "reference"))
 
   examples_env(pkg)
   expect_equal(getOption("width"), 50)

tests/testthat/test-check-built.R

@@ -11,7 +11,7 @@ test_that("readme can use images from vignettes", {
     test_path("assets/articles-images/man/figures/kitten.jpg"),
     path(pkg$src_path, "vignettes/kitten.jpg")
   )
-  withr::defer(unlink(path(pkg$src_path, "vignettes/kitten.jpg")))
+  withr::defer(file_delete(path(pkg$src_path, "vignettes/kitten.jpg")))
 
   suppressMessages(build_home(pkg))
   suppressMessages(build_articles(pkg))

tests/testthat/test-highlight.R

@@ -1,5 +1,5 @@
 test_that("highlight_examples captures dependencies", {
-  withr::defer(unlink(test_path("Rplot001.png")))
+  withr::defer(file_delete(test_path("Rplot001.png")))
 
   dummy_dep <- htmltools::htmlDependency("dummy", "1.0.0", "dummy.js")
   widget <- htmlwidgets::createWidget("test", list(), dependencies = dummy_dep)
@@ -10,7 +10,7 @@ test_that("highlight_examples captures dependencies", {
 })
 
 test_that("highlight_text & highlight_examples include sourceCode div", {
-  withr::defer(unlink(test_path("Rplot001.png")))
+  withr::defer(file_delete(test_path("Rplot001.png")))
 
   html <- xml2::read_html(highlight_examples("a + a", "x"))
   expect_equal(xpath_attr(html, "./body/div", "class"), "sourceCode")

tests/testthat/test-markdown.R

@@ -6,7 +6,7 @@ test_that("handles empty inputs", {
   expect_equal(markdown_text_block(""), NULL)
 
   path <- withr::local_tempfile()
-  file.create(path)
+  file_create(path)
   expect_equal(markdown_body(path), NULL)
 })
 

tests/testthat/test-navbar.R

@@ -93,7 +93,7 @@ test_that("data_navbar() can re-order default elements", {
         left: [github, search]
         right: [news]
   ")
-  file.create(path(pkg$src_path, "NEWS.md"))
+  file_create(path(pkg$src_path, "NEWS.md"))
 
   expect_snapshot(data_navbar(pkg)[c("left", "right")])
 })

tests/testthat/test-package.R

@@ -49,7 +49,7 @@ test_that("package_vignettes() detects conflicts in final article paths", {
 test_that("package_vignettes() sorts articles alphabetically by file name", {
   pkg <- local_pkgdown_site(test_path("assets/articles"))
   expect_equal(
-    order(basename(pkg$vignettes$file_out)),
+    order(path_file(pkg$vignettes$file_out)),
     seq_len(nrow(pkg$vignettes))
   )
 })

tests/testthat/test-templates.R

@@ -73,8 +73,8 @@ test_that("find templates in local pkgdown first", {
 # Expected contents -------------------------------------------------------
 
 test_that("BS5 templates have main + aside", {
-  names <- dir(path_pkgdown("bs5", "templates"), pattern = "content-")
-  names <- path_ext_remove(names)
+  names <- dir_ls(path_pkgdown("bs5", "templates"), regexp = "content-")
+  names <- path_ext_remove(path_file(names))
   names <- gsub("content-", "", names)
 
   templates <- lapply(names, read_template_html,