Respect renv lockfiles

DESCRIPTION

@@ -19,7 +19,7 @@ License: GPL-2
 URL: https://github.com/rstudio/rsconnect
 BugReports: https://github.com/rstudio/rsconnect/issues
 Depends:
-    R (>= 3.0.0)
+    R (>= 3.5.0)
 Imports:
     cli,
     curl,
@@ -28,13 +28,16 @@ Imports:
     lifecycle,
     openssl (>= 2.0.0),
     packrat (>= 0.6),
+    renv (>= 0.17.0),
     rlang (>= 1.0.0),
     rstudioapi (>= 0.5),
     tools,
     yaml (>= 2.1.5)
 Suggests:
     knitr,
     Biobase,
+    BiocManager,
+    foreign,
     MASS,
     mockr,
     plumber (>= 0.3.2),

NEWS.md

@@ -1,5 +1,15 @@
 # rsconnect (development version)
 
+* `deployApp()` and `writeManifest()` now respect renv lock files, if present. 
+  If you don't want to use these lockfiles, and instead return the previous 
+  behaviour of snapshotting on every deploy, add your `renv.lock` to 
+  `.rscignore` (#671). Learn more `?appDependencies()`.
+
+* `deployApp()` and `writeManifest()` now use renv to capture app dependencies, 
+  rather than packrat. If this causes a previously working deploy to fail, 
+  please file an issue then set `options(rsconnect.packrat = TRUE)` to revert 
+  to the previous behaviour.
+
 * `deployApp()`'s `quarto` argument now takes values `TRUE`, `FALSE` or 
   `NA`. The previous value (a path to a quarto binary) is now deprecated,
   and instead we automatically figure out the packge from `QUARTO_PATH` and

R/appDependencies.R

@@ -8,6 +8,27 @@
 #' and adds all recursive dependencies to create a complete manifest of
 #' package packages need to be installed to run the app.
 #'
+#' # Dependency discovery
+#'
+#' rsconnect use one of three mechanisms to find which packages your application
+#' uses:
+#'
+#' 1. If `renv.lock` is present, it will use the versions and sources defined in
+#'    that file. If you're using the lockfile for some other purpose and
+#'    don't want it to affect deployment, add `renv.lock` to `.rscignore`.
+#'
+#' 2. Otherwise, rsconnect will call `renv::snapshot()` to find all packages
+#'    used by your code. If you'd instead prefer to only use the packages
+#'    declared in a `DESCRIPTION` file, run
+#'    `renv::settings$snapshot.type("explicit")` to activate renv's "explicit"
+#'    mode.
+#'
+#' 3. Dependency resolution using renv is a new feature in rsconnect 1.0.0, and
+#'    while we have done our best to test it, it still might fail for your app.
+#'    If this happens, please [file an issue](http://github.com/rstudio/rsconnect/issues)
+#'    then set `options(rsconnect.packrat = TRUE)` to revert to the old
+#'    dependency discovery mechanism.
+#'
 #' # Remote installation
 #'
 #' When deployed, the app must first install all of these packages, and
@@ -105,7 +126,7 @@ appDependencies <- function(appDir = getwd(), appFiles = NULL) {
   on.exit(unlink(bundleDir, recursive = TRUE), add = TRUE)
 
   extraPackages <- inferRPackageDependencies(appMetadata)
-  deps <- snapshotRDependencies(bundleDir, extraPackages)
+  deps <- computePackageDependencies(bundleDir, extraPackages, quiet = TRUE)
   deps[c("Package", "Version", "Source", "Repository")]
 }
 

R/bundle.R

@@ -112,15 +112,17 @@ createAppManifest <- function(appDir,
                               retainPackratDirectory = TRUE,
                               isCloudServer = FALSE,
                               image = NULL,
-                              verbose = FALSE) {
+                              verbose = FALSE,
+                              quiet = FALSE) {
 
   if (needsR(appMetadata)) {
     extraPackages <- inferRPackageDependencies(appMetadata)
     # provide package entries for all dependencies
     packages <- bundlePackages(
       bundleDir = appDir,
       extraPackages = extraPackages,
-      verbose = verbose
+      verbose = verbose,
+      quiet = quiet
     )
   } else {
     packages <- list()

R/bundleFiles.R

@@ -179,7 +179,7 @@ ignoreBundleFiles <- function(dir, contents) {
     # rsconnect packages
     "rsconnect", "rsconnect-python", "manifest.json",
     # packrat + renv,
-    "renv", "renv.lock", "packrat",
+    "renv", "packrat",
     # version control
     ".git", ".gitignore", ".svn",
     # R/RStudio