From a137ea222c9787bb25681214fd6e38b0665d1068 Mon Sep 17 00:00:00 2001
From: Charles Teague <cteague@gmail.com>
Date: Wed, 13 Jul 2022 14:56:30 -0400
Subject: [PATCH 1/2] =?UTF-8?q?Don=E2=80=99t=20include=20HTML=20dependenci?=
 =?UTF-8?q?es=20(from=20R=20execution)=20unless=20we=E2=80=99re=20targetin?=
 =?UTF-8?q?g=20HTML=20output?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should fix #1378
---
 src/resources/rmd/execute.R | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/resources/rmd/execute.R b/src/resources/rmd/execute.R
index 4fbacec82a6..c276be152c4 100644
--- a/src/resources/rmd/execute.R
+++ b/src/resources/rmd/execute.R
@@ -332,7 +332,7 @@ knitr_cache_dir <- function(input, format) {
 pandoc_includes <- function(input, format, output, files_dir, knit_meta, tempDir) {
 
   # get dependencies from render 
-  dependencies <- dependencies_from_render(input, files_dir, knit_meta)
+  dependencies <- dependencies_from_render(input, files_dir, knit_meta, format)
 
   # embed shiny_prerendered dependencies
   if (!is.null(dependencies$shiny)) {
@@ -351,7 +351,7 @@ pandoc_includes <- function(input, format, output, files_dir, knit_meta, tempDir
 }
 
 # get dependencies implied by the result of render (e.g. html dependencies)
-dependencies_from_render <- function(input, files_dir, knit_meta) {
+dependencies_from_render <- function(input, files_dir, knit_meta, format) {
 
   # check for runtime
   front_matter <- rmarkdown::yaml_front_matter(input)
@@ -381,12 +381,18 @@ dependencies_from_render <- function(input, files_dir, knit_meta) {
   }
 
   # get extras (e.g. html dependencies)
-  extras <- rmarkdown:::html_extras_for_document(
-    knit_meta,
-    runtime,
-    resolver,
-    list() # format deps
-  )
+  # only include these html extras if we're targeting a format that
+  # supports html (widgets) like this or that prefers html (e.g. Hugo)
+  if (is_pandoc_html_format(format) | format$render$`prefer-html`) {
+    extras <- rmarkdown:::html_extras_for_document(
+      knit_meta,
+      runtime,
+      resolver,
+      list() # format deps
+    )
+  } else {
+    extras = {}
+  }
 
   # filter out bootstrap
   extras$dependencies <- Filter(

From c455a14e77f133203bd847374486df5923cbc493 Mon Sep 17 00:00:00 2001
From: JJ Allaire <jj@rstudio.com>
Date: Wed, 13 Jul 2022 18:19:09 -0400
Subject: [PATCH 2/2] use || operator

---
 src/resources/rmd/execute.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resources/rmd/execute.R b/src/resources/rmd/execute.R
index c276be152c4..41df1c3d4b9 100644
--- a/src/resources/rmd/execute.R
+++ b/src/resources/rmd/execute.R
@@ -383,7 +383,7 @@ dependencies_from_render <- function(input, files_dir, knit_meta, format) {
   # get extras (e.g. html dependencies)
   # only include these html extras if we're targeting a format that
   # supports html (widgets) like this or that prefers html (e.g. Hugo)
-  if (is_pandoc_html_format(format) | format$render$`prefer-html`) {
+  if (is_pandoc_html_format(format) || format$render$`prefer-html`) {
     extras <- rmarkdown:::html_extras_for_document(
       knit_meta,
       runtime,