more work on supporting server: shiny

Author: jjallaire

R/html_document_base.R

@@ -121,14 +121,14 @@ html_document_base <- function(theme = NULL,
       if (is_bs_theme(theme)) {
         theme <- bslib::bs_global_get()
       }
-      bootstrap_deps <- if (is_bs_theme(theme) && is_shiny(runtime)) {
+      bootstrap_deps <- if (is_bs_theme(theme) && is_shiny(runtime, metadata[["server"]])) {
         list(shiny_bootstrap_lib(theme))
       } else {
         bootstrap_dependencies(theme)
       }
       format_deps <- append(format_deps, htmltools::resolveDependencies(bootstrap_deps))
     }
-    else if (isTRUE(bootstrap_compatible) && is_shiny(runtime)) {
+    else if (isTRUE(bootstrap_compatible) && is_shiny(runtime, metadata[["server"]])) {
       # If we can add bootstrap for Shiny, do it
       format_deps <- append(format_deps, bootstrap_dependencies("bootstrap"))
     }

R/render.R

@@ -576,7 +576,7 @@ render <- function(input,
 
   # determine our id-prefix (add one if necessary for runtime: shiny)
   id_prefix <- id_prefix_from_args(output_format$pandoc$args)
-  if (!nzchar(id_prefix) && is_shiny(runtime)) {
+  if (!nzchar(id_prefix) && is_shiny(runtime, front_matter[["server"]])) {
     id_prefix <- "section-"
     output_format$pandoc$args <- c(output_format$pandoc$args, rbind("--id-prefix", id_prefix))
   }

R/shiny.R

@@ -96,8 +96,8 @@ run <- function(file = "index.Rmd", dir = dirname(file), default_file = NULL,
       } else {
         # look for first one that has runtime: shiny
         for (rmd in allRmds) {
-          runtime <- yaml_front_matter(file.path(dir, rmd))$runtime
-          if (is_shiny(runtime)) {
+          yaml <- yaml_front_matter(file.path(dir, rmd))
+          if (is_shiny(yaml$runtime, yaml$server)) {
             default_file <- rmd
             break
           }
@@ -564,8 +564,9 @@ render_delayed <- function(expr) {
   quoted = TRUE)
 }
 
-is_shiny <- function(runtime) {
-  !is.null(runtime) && grepl('^shiny', runtime)
+is_shiny <- function(runtime, server = NULL) {
+  (!is.null(runtime) && grepl('^shiny', runtime)) ||
+  is_shiny_prerendered(runtime, server)
 }
 
 is_shiny_classic <- function(runtime) {