Skip to content

Don’t include HTML dependencies (from R execution) unless we’re targe… #1381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjallaire merged 2 commits into from
Jul 13, 2022
Merged

Don’t include HTML dependencies (from R execution) unless we’re targe… #1381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a137ea2
Don’t include HTML dependencies (from R execution) unless we’re targe…
dragonstyle Jul 13, 2022
c455a14
use || operator
jjallaire Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/resources/rmd/execute.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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)
Expand Down Expand Up @@ -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(
Expand Down