remove encoding in shiny_prerendered_app() and shiny_prerendered_ht…

…ml()

R/shiny.R

@@ -119,9 +119,6 @@ run <- function(file = "index.Rmd", dir = dirname(file), default_file = NULL,
     }
   }
 
-  # pick up encoding
-  encoding <- render_args$encoding %||% "UTF-8"
-
   if (is.null(render_args$envir)) render_args$envir <- parent.frame()
 
   # determine the runtime of the target file
@@ -132,7 +129,7 @@ run <- function(file = "index.Rmd", dir = dirname(file), default_file = NULL,
   if (is_shiny_prerendered(runtime)) {
 
     # get the pre-rendered shiny app
-    app <- shiny_prerendered_app(target_file, encoding = encoding, render_args = render_args)
+    app <- shiny_prerendered_app(target_file, render_args = render_args)
   } else {
 
     # add rmd_resources handler on start

R/shiny_prerendered.R

@@ -1,9 +1,9 @@
 
 # Create a shiny app object from an Rmd w/ runtime: shiny_prerendered
-shiny_prerendered_app <- function(input_rmd, encoding, render_args) {
+shiny_prerendered_app <- function(input_rmd, render_args) {
 
   # get rendered html and capture dependencies
-  html <- shiny_prerendered_html(input_rmd, encoding, render_args)
+  html <- shiny_prerendered_html(input_rmd, render_args)
   deps <- attr(html, "html_dependencies")
 
   # create the server environment
@@ -61,7 +61,7 @@ shiny_prerendered_app <- function(input_rmd, encoding, render_args) {
 
 # Generate the html for a runtime: shiny_prerendered Rmd (attempts to use
 # an existing rendering of the html if it's still valid)
-shiny_prerendered_html <- function(input_rmd, encoding, render_args) {
+shiny_prerendered_html <- function(input_rmd, render_args) {
 
   # determine the path to the rendered_html
   output_file <- render_args$output_file
@@ -78,15 +78,14 @@ shiny_prerendered_html <- function(input_rmd, encoding, render_args) {
     input_rmd,
     rendered_html,
     output_dir,
-    encoding,
     prerender_option
   )
 
   # prerender if necessary
   if (prerender) {
 
     # execute the render
-    args <- merge_lists(list(input = input_rmd, encoding = encoding), render_args)
+    args <- merge_lists(list(input = input_rmd), render_args)
     rendered_html <- do.call(render, args)
   }
 
@@ -145,7 +144,6 @@ shiny_prerendered_prerender <- function(
   input_rmd,
   rendered_html,
   output_dir,
-  encoding,
   prerender_option
 ) {
   if (file.access(output_dir, 2) != 0) {
@@ -176,7 +174,7 @@ shiny_prerendered_prerender <- function(
   }
 
   # find external resources referenced by the file
-  external_resources <- find_external_resources(input_rmd, encoding)
+  external_resources <- find_external_resources(input_rmd)
 
   # get paths to external resources
   input_files <- c(input_rmd, file.path(output_dir, external_resources$path))
@@ -219,7 +217,7 @@ shiny_prerendered_prerender <- function(
         #   means old prerender version, render again
         if (!isTRUE(get_package_version_string(depPkg) == depVer)) {
           # was not rendered with the same R package. must render again
-          return (TRUE)
+          return(TRUE)
         }
         pkgsSeen[[depPkg]] <- depVer
       }