From 385814e65ab1df9363f11d606a9c6a087bff7d60 Mon Sep 17 00:00:00 2001
From: George Stagg <george.stagg@posit.co>
Date: Fri, 3 May 2024 09:54:19 +0100
Subject: [PATCH] Improve calculation of package set difference

Avoids downloading and deploying R packages already contained in the
shiny base image.
---
 R/packages.R | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/R/packages.R b/R/packages.R
index f01f76f..33646fb 100644
--- a/R/packages.R
+++ b/R/packages.R
@@ -201,10 +201,10 @@ prepare_wasm_metadata <- function(pkg, metadata, verbose) {
 download_wasm_packages <- function(appdir, destdir, verbose, package_cache) {
   verbose_print <- if (verbose) message else list
   # App dependencies, ignoring shiny packages in base webR image
+  shiny_pkgs <- resolve_dependencies(c("shiny", "bslib", "renv"), verbose)
   pkgs <- unique(renv::dependencies(appdir, quiet = !verbose)$Package)
-  pkgs <- pkgs[pkgs != "shiny" & pkgs != "bslib"]
   if (length(pkgs) > 0) {
-    pkgs <- resolve_dependencies(pkgs, verbose)
+    pkgs <- resolve_dependencies(pkgs, verbose) |> setdiff(shiny_pkgs)
   }
 
   if (verbose) {