Insert <head> content after script tags

yarn build (GitHub Actions)
Load script tags the normal way instead of with jQuery's synchronouse XHR
2026-01-11 07:58:11 -05:00 · 2022-07-07 22:01:01 -05:00 · 2022-07-07 20:01:30 +00:00 · 2022-07-07 14:54:29 -05:00 · 2022-07-07 13:37:37 -05:00 · 2022-07-07 13:36:21 -05:00
78 changed files with 2577 additions and 1423 deletions
--- a/5
+++ b/5
@@ -105,7 +105,6 @@ Suggests:
    ggplot2,
    reactlog (>= 1.0.0),
    magrittr,
-    shinytest (>= 1.4.0.9003),
    yaml,
    future,
    dygraphs,
@@ -202,8 +201,10 @@ Collate:
    'version_selectize.R'
    'version_strftime.R'
    'viewer.R'
-RoxygenNote: 7.1.2
+RoxygenNote: 7.2.0
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RdMacros: lifecycle
 Config/testthat/edition: 3
+Config/Needs/check:
+  rstudio/shinytest2
--- a/NEWS.md
+++ b/NEWS.md
@@ -5,6 +5,8 @@ shiny development

 ### Breaking changes

+* Closed #3626: `renderPlot()` (and `plotPNG()`) now uses `ragg::agg_png()` by default when the [`{ragg}` package](https://github.com/r-lib/ragg) is installed. To restore the previous behavior, set `options(shiny.useragg = FALSE)`. (#3654)
+
 ### Minor new features and improvements

 * Shiny's internal HTML dependencies are now mounted dynamically instead of statically. (#3537)
@@ -13,18 +15,41 @@ shiny development

 * Default for `ref` input in `runGithub()` changed from `"master"` to `"HEAD"`. (#3346)

-* When taking a test snapshot, the sort order of the json keys of the `input`, `output`, and `export` fields is currently sorted using the locale of the machine. This can lead to inconsistent test snapshot results. To opt-in to a consistent ordering of snapshot fields with `{shinytest}`, please set the global option `options(shiny.snapshotsortc = TRUE)`. `{shinytest2}` users do not need to set this value.  (#3515)
+* When taking a test snapshot, the sort order of the json keys of the `input`, `output`, and `export` fields is currently sorted using the locale of the machine. This can lead to inconsistent test snapshot results. To opt-in to a consistent ordering of snapshot fields with `{shinytest}`, please set the global option `options(shiny.snapshotsortc = TRUE)`. `{shinytest2}` users do not need to set this value. (#3515)
+
+* The auto-reload feature (`options(shiny.autoreload=TRUE)`) was not being activated by `devmode(TRUE)`, despite a console message asserting that it was. (#3620)
+
+* Add `shiny.mathjax.url` and `shiny.mathjax.config` options for configuring the MathJax URL used by `withMathJax`. Thanks, @Neutron3529! (#3639)

 ### Bug fixes

+* Closed #3657: `throttle.ts` and the `Throttler` typescript objects it provides now function as intended.
+
 * Closed tidyverse/dplyr#5552: Compatibility of dplyr 1.0 (and rlang chained errors in general) with `req()`, `validate()`, and friends.

+* Closed #1545: `insertUI()` now executes `<script>` tags. (#3630)
+
 * Closed #2955: Input and output bindings previously attempted to use `el['data-input-id']`, but that never worked. They now use `el.getAttribute('data-input-id')` instead. (#3538)

 * Closed tidyverse/dplyr#6154: Values from an `actionButton()` had S3 classes in the incorrect order.

 * Fixed a bug where updating an input value without a corresponding Input binding element did not trigger a JavaScript `shiny:inputchanged` event. Now, if no Input binding element is found, the `shiny:inputchanged` event is triggered on `window.document`. (#3584)

+* Restored the previous behavior of automatically guessing the `Content-Type` header for `downloadHandler` functions when no explicit `contentType` argument is supplied. (#3393)
+
+* Closed #3619: In R 4.2, `splitLayout()` raised warnings about incorrect length in an `if` statement. (Thanks to @dmenne, #3625)
+
+* Closed #2297: If an error occurred in parsing a value in a bookmark query string, an error would be thrown and nothing would be restored. Now a message is displayed and that value is ignored. (Thanks to @daattali, #3385)
+
+* `fileInput()` can set the `capture` attribute to facilitates user access to a device's media capture mechanism, such as a camera, or microphone, from within a file upload control ([W3C HTML Media Capture](https://www.w3.org/TR/html-media-capture/)). (Thanks to khaled-alshamaa, #3481)
+
+* Closed rstudio/shinytest2#222: When restoring a context (i.e., bookmarking) from a URL, Shiny now better handles a trailing `=` after `_inputs_` and `_values_`. (#3648)
+
+* Closed #3581: Errors in throttled/debounced reactive expressions no longer cause the session to exit. (#3624)
+
+* Closed #3250:`{rlang}`/`{tidyeval}` conditions (i.e., warnings and errors) are no longer filtered from stack traces. (#3602)
+
+
 shiny 1.7.1
 ===========

--- a/R/app_template.R
+++ b/R/app_template.R
@@ -10,8 +10,7 @@
 #' 2: app.R              : Main application file
 #' 3: R/example.R        : Helper file with R code
 #' 4: R/example-module.R : Example module
-#' 5: tests/shinytest/   : Tests using the shinytest package
-#' 6: tests/testthat/    : Tests using the testthat package
+#' 5: tests/testthat/    : Tests using the testthat and shinytest2 package
 #' ```
 #'
 #' If option 1 is selected, the full example application including the
@@ -24,13 +23,11 @@
 #' |   |- example-module.R
 #' |   `- example.R
 #' `- tests
-#'     |- shinytest.R
-#'     |- shinytest
-#'     |   `- mytest.R
 #'     |- testthat.R
 #'     `- testthat
 #'         |- test-examplemodule.R
 #'         |- test-server.R
+#'         |- test-shinytest2.R
 #'         `- test-sort.R
 #' ```
 #'
@@ -45,20 +42,20 @@
 #' * `tests/` contains various tests for the application. You may
 #'   choose to use or remove any of them. They can be executed by the
 #'   [runTests()] function.
-#' * `tests/shinytest.R` is a test runner for test files in the
-#'   `tests/shinytest/` directory.
-#' * `tests/shinytest/mytest.R` is a test that uses the
-#'   [shinytest](https://rstudio.github.io/shinytest/) package to do
-#'   snapshot-based testing.
 #' * `tests/testthat.R` is a test runner for test files in the
-#'   `tests/testthat/` directory using the [testthat](https://testthat.r-lib.org/) package.
+#'   `tests/testthat/` directory using the
+#'   [shinytest2](https://rstudio.github.io/shinytest2/reference/test_app.html)
+#'   package.
 #' * `tests/testthat/test-examplemodule.R` is a test for an application's module server function.
 #' * `tests/testthat/test-server.R` is a test for the application's server code
+#' * `tests/testthat/test-shinytest2.R` is a test that uses the
+#'   [shinytest2](https://rstudio.github.io/shinytest2/) package to do
+#'   snapshot-based testing.
 #' * `tests/testthat/test-sort.R` is a test for a supporting function in the `R/` directory.
 #'
 #' @param path Path to create new shiny application template.
 #' @param examples Either one of "default", "ask", "all", or any combination of
-#'   "app", "rdir", "module", "shinytest", and "testthat". In an
+#'   "app", "rdir", "module", and "tests". In an
 #'   interactive session, "default" falls back to "ask"; in a non-interactive
 #'   session, "default" falls back to "all". With "ask", this function will
 #'   prompt the user to select which template items will be added to the new app
@@ -79,15 +76,19 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
  # =======================================================

  choices <- c(
-    app       = "app.R              : Main application file",
-    rdir      = "R/example.R        : Helper file with R code",
-    module    = "R/example-module.R : Example module",
-    shinytest = "tests/shinytest/   : Tests using the shinytest package",
-    testthat  = "tests/testthat/    : Tests using the testthat package"
+    app    = "app.R              : Main application file",
+    rdir   = "R/example.R        : Helper file with R code",
+    module = "R/example-module.R : Example module",
+    tests  = "tests/testthat/    : Tests using {testthat} and {shinytest2}"
  )

+  # Support legacy value
+  examples[examples == "shinytest"] <- "tests"
+  examples[examples == "testthat"] <- "tests"
+  examples <- unique(examples)
+
  if (identical(examples, "default")) {
-    if (interactive()) {
+    if (rlang::is_interactive()) {
      examples <- "ask"
    } else {
      examples <- "all"
@@ -124,18 +125,8 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
    return(invisible())
  }

-  if ("shinytest" %in% examples) {
-    if (!is_installed("shinytest", "1.4.0"))
-    {
-      message(
-        "The tests/shinytest directory needs shinytest 1.4.0 or later to work properly."
-      )
-      if (is_installed("shinytest")) {
-        message("You currently have shinytest ",
-                get_package_version("shinytest"), " installed.")
-      }
-
-    }
+  if ("tests" %in% examples) {
+    rlang::check_installed("shinytest2", "for {testthat} tests to work as expected")
  }

  # =======================================================
@@ -208,16 +199,13 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
  }

  # Copy the files for a tests/ subdirectory
-  copy_test_dir <- function(name) {
+  copy_test_dir <- function() {
    files <- dir(template_path("tests"), recursive = TRUE)
-    # Note: This is not the same as using dir(pattern = "^shinytest"), since
-    # that will not match files inside of shinytest/.
-    files <- files[grepl(paste0("^", name), files)]

    # Filter out files that are not module files in the R directory.
    if (! "rdir" %in% examples) {
      # find all files in the testthat folder that are not module or server files
-      is_r_folder_file <- (!grepl("module|server", basename(files))) & (dirname(files) == "testthat")
+      is_r_folder_file <- !grepl("module|server|shinytest2|testthat", basename(files))
      files <- files[!is_r_folder_file]
    }

@@ -282,12 +270,10 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
    copy_file(file.path("R", module_files))
  }

-  # tests/ dir
-  if ("shinytest" %in% examples) {
-    copy_test_dir("shinytest")
-  }
-  if ("testthat" %in% examples) {
-    copy_test_dir("testthat")
+  # tests/testthat dir
+  if ("tests" %in% examples) {
+    copy_test_dir()
  }
+
  invisible()
 }
--- a/R/bookmark-state.R
+++ b/R/bookmark-state.R
@@ -321,34 +321,38 @@ RestoreContext <- R6Class("RestoreContext",
      if (substr(queryString, 1, 1) == '?')
        queryString <- substr(queryString, 2, nchar(queryString))

+      # The "=" after "_inputs_" is optional. Shiny doesn't generate URLs with
+      # "=", but httr always adds "=".
+      inputs_reg <- "(^|&)_inputs_=?(&|$)"
+      values_reg <- "(^|&)_values_=?(&|$)"

      # Error if multiple '_inputs_' or '_values_'. This is needed because
      # strsplit won't add an entry if the search pattern is at the end of a
      # string.
-      if (length(gregexpr("(^|&)_inputs_(&|$)", queryString)[[1]]) > 1)
+      if (length(gregexpr(inputs_reg, queryString)[[1]]) > 1)
        stop("Invalid state string: more than one '_inputs_' found")
-      if (length(gregexpr("(^|&)_values_(&|$)", queryString)[[1]]) > 1)
+      if (length(gregexpr(values_reg, queryString)[[1]]) > 1)
        stop("Invalid state string: more than one '_values_' found")

      # Look for _inputs_ and store following content in inputStr
-      splitStr <- strsplit(queryString, "(^|&)_inputs_(&|$)")[[1]]
+      splitStr <- strsplit(queryString, inputs_reg)[[1]]
      if (length(splitStr) == 2) {
        inputStr <- splitStr[2]
        # Remove any _values_ (and content after _values_) that may come after
        # _inputs_
-        inputStr <- strsplit(inputStr, "(^|&)_values_(&|$)")[[1]][1]
+        inputStr <- strsplit(inputStr, values_reg)[[1]][1]

      } else {
        inputStr <- ""
      }

      # Look for _values_ and store following content in valueStr
-      splitStr <- strsplit(queryString, "(^|&)_values_(&|$)")[[1]]
+      splitStr <- strsplit(queryString, values_reg)[[1]]
      if (length(splitStr) == 2) {
        valueStr <- splitStr[2]
        # Remove any _inputs_ (and content after _inputs_) that may come after
        # _values_
-        valueStr <- strsplit(valueStr, "(^|&)_inputs_(&|$)")[[1]][1]
+        valueStr <- strsplit(valueStr, inputs_reg)[[1]][1]

      } else {
        valueStr <- ""
@@ -359,16 +363,20 @@ RestoreContext <- R6Class("RestoreContext",
      values <- parseQueryString(valueStr, nested = TRUE)

      valuesFromJSON <- function(vals) {
-        mapply(names(vals), vals, SIMPLIFY = FALSE,
+        varsUnparsed <- c()
+        valsParsed <- mapply(names(vals), vals, SIMPLIFY = FALSE,
          FUN = function(name, value) {
            tryCatch(
              safeFromJSON(value),
              error = function(e) {
-                stop("Failed to parse URL parameter \"", name, "\"")
+                varsUnparsed <<- c(varsUnparsed, name)
+                warning("Failed to parse URL parameter \"", name, "\"")
              }
            )
          }
        )
+        valsParsed[varsUnparsed] <- NULL
+        valsParsed
      }

      inputs <- valuesFromJSON(inputs)
--- a/R/bootstrap-deprecated.R
+++ b/R/bootstrap-deprecated.R
@@ -6,7 +6,7 @@
 #' @param sidebarPanel The [sidebarPanel] containing input controls
 #' @param mainPanel The [mainPanel] containing outputs
 #' @keywords internal
-#' @return A UI defintion that can be passed to the [shinyUI] function
+#' @return A UI definition that can be passed to the [shinyUI] function
 #' @export
 pageWithSidebar <- function(headerPanel,
                            sidebarPanel,
--- a/R/bootstrap-layout.R
+++ b/R/bootstrap-layout.R
@@ -13,7 +13,7 @@
 #'   Can also be set as a side effect of the [titlePanel()] function.
 #' @inheritParams bootstrapPage
 #'
-#' @return A UI defintion that can be passed to the [shinyUI] function.
+#' @return A UI definition that can be passed to the [shinyUI] function.
 #'
 #' @details To create a fluid page use the `fluidPage` function and include
 #'   instances of `fluidRow` and [column()] within it. As an
@@ -111,7 +111,7 @@ fluidRow <- function(...) {
 #' @param title The browser window title (defaults to the host URL of the page)
 #' @inheritParams bootstrapPage
 #'
-#' @return A UI defintion that can be passed to the [shinyUI] function.
+#' @return A UI definition that can be passed to the [shinyUI] function.
 #'
 #' @details To create a fixed page use the `fixedPage` function and include
 #'   instances of `fixedRow` and [column()] within it. Note that
@@ -516,7 +516,7 @@ splitLayout <- function(..., cellWidths = NULL, cellArgs = list()) {
  children <- children[childIdx]
  count <- length(children)

-  if (length(cellWidths) == 0 || is.na(cellWidths)) {
+  if (length(cellWidths) == 0 || isTRUE(is.na(cellWidths))) {
    cellWidths <- sprintf("%.3f%%", 100 / count)
  }
  cellWidths <- rep(cellWidths, length.out = count)
--- a/R/bootstrap.R
+++ b/R/bootstrap.R
@@ -24,7 +24,7 @@ NULL
 #'   This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="en">}.
 #'   The default (NULL) results in an empty string.
 #'
-#' @return A UI defintion that can be passed to the [shinyUI] function.
+#' @return A UI definition that can be passed to the [shinyUI] function.
 #'
 #' @note The `basicPage` function is deprecated, you should use the
 #'   [fluidPage()] function instead.
@@ -385,7 +385,7 @@ collapseSizes <- function(padding) {
 #' @inheritParams bootstrapPage
 #' @param icon Optional icon to appear on a `navbarMenu` tab.
 #'
-#' @return A UI defintion that can be passed to the [shinyUI] function.
+#' @return A UI definition that can be passed to the [shinyUI] function.
 #'
 #' @details The `navbarMenu` function can be used to create an embedded
 #'   menu within the navbar that in turns includes additional tabPanels (see
--- a/R/conditions.R
+++ b/R/conditions.R
@@ -421,8 +421,17 @@ pruneStackTrace <- function(parents) {
  # Loop over the parent indices. Anything that is not parented by current_node
  # (a.k.a. last-known-good node), or is a dupe, can be discarded. Anything that
  # is kept becomes the new current_node.
+  #
+  # jcheng 2022-03-18: Two more reasons a node can be kept:
+  #   1. parent is 0
+  #   2. parent is i
+  # Not sure why either of these situations happen, but they're common when
+  # interacting with rlang/dplyr errors. See issue rstudio/shiny#3250 for repro
+  # cases.
  include <- vapply(seq_along(parents), function(i) {
-    if (!is_dupe[[i]] && parents[[i]] == current_node) {
+    if ((!is_dupe[[i]] && parents[[i]] == current_node) ||
+        parents[[i]] == 0 ||
+        parents[[i]] == i) {
      current_node <<- i
      TRUE
    } else {
--- a/R/imageutils.R
+++ b/R/imageutils.R
@@ -1,19 +1,14 @@
 startPNG <- function(filename, width, height, res, ...) {
-  # shiny.useragg is an experimental option that isn't officially supported or
-  # documented. It's here in the off chance that someone really wants
-  # to use ragg (say, instead of showtext, for custom font rendering).
-  # In the next shiny release, this option will likely be superseded in
-  # favor of a fully customizable graphics device option
-  if ((getOption('shiny.useragg') %||% FALSE) && is_installed("ragg")) {
-    pngfun <- ragg::agg_png
+  pngfun <- if ((getOption('shiny.useragg') %||% TRUE) && is_installed("ragg")) {
+    ragg::agg_png
  } else if (capabilities("aqua")) {
    # i.e., png(type = 'quartz')
-    pngfun <- grDevices::png
+    grDevices::png
  } else if ((getOption('shiny.usecairo') %||% TRUE) && is_installed("Cairo")) {
-    pngfun <- Cairo::CairoPNG
+    Cairo::CairoPNG
  } else {
    # i.e., png(type = 'cairo')
-    pngfun <- grDevices::png
+    grDevices::png
  }

  args <- rlang::list2(filename=filename, width=width, height=height, res=res, ...)
@@ -57,33 +52,31 @@ startPNG <- function(filename, width, height, res, ...) {
  grDevices::dev.cur()
 }

-#' Run a plotting function and save the output as a PNG
+#' Capture a plot as a PNG file.
 #'
-#' This function returns the name of the PNG file that it generates. In
-#' essence, it calls `png()`, then `func()`, then `dev.off()`.
-#' So `func` must be a function that will generate a plot when used this
-#' way.
-#'
-#' For output, it will try to use the following devices, in this order:
-#' quartz (via [grDevices::png()]), then [Cairo::CairoPNG()],
-#' and finally [grDevices::png()]. This is in order of quality of
-#' output. Notably, plain `png` output on Linux and Windows may not
-#' antialias some point shapes, resulting in poor quality output.
-#'
-#' In some cases, `Cairo()` provides output that looks worse than
-#' `png()`. To disable Cairo output for an app, use
-#' `options(shiny.usecairo=FALSE)`.
+#' The PNG graphics device used is determined in the following order:
+#'   * If the ragg package is installed (and the `shiny.useragg` is not
+#'    set to `FALSE`), then use [ragg::agg_png()].
+#'   * If a quartz device is available (i.e., `capabilities("aqua")` is
+#'    `TRUE`), then use `png(type = "quartz")`.
+#'   * If the Cairo package is installed (and the `shiny.usecairo` option
+#'    is not set to `FALSE`), then use [Cairo::CairoPNG()].
+#'   * Otherwise, use [grDevices::png()]. In this case, Linux and Windows
+#'    may not antialias some point shapes, resulting in poor quality output.
 #'
 #' @param func A function that generates a plot.
 #' @param filename The name of the output file. Defaults to a temp file with
 #'   extension `.png`.
 #' @param width Width in pixels.
 #' @param height Height in pixels.
-#' @param res Resolution in pixels per inch. This value is passed to
-#'   [grDevices::png()]. Note that this affects the resolution of PNG rendering in
+#' @param res Resolution in pixels per inch. This value is passed to the
+#'   graphics device. Note that this affects the resolution of PNG rendering in
 #'   R; it won't change the actual ppi of the browser.
-#' @param ... Arguments to be passed through to [grDevices::png()].
-#'   These can be used to set the width, height, background color, etc.
+#' @param ... Arguments to be passed through to the graphics device. These can
+#'   be used to set the width, height, background color, etc.
+#'
+#' @return A path to the newly generated PNG file.
+#'
 #' @export
 plotPNG <- function(func, filename=tempfile(fileext='.png'),
                    width=400, height=400, res=72, ...) {
--- a/R/input-file.R
+++ b/R/input-file.R
@@ -23,7 +23,18 @@
 #' @param buttonLabel The label used on the button. Can be text or an HTML tag
 #'   object.
 #' @param placeholder The text to show before a file has been uploaded.
+#' @param capture What source to use for capturing image, audio or video data.
+#'   This attribute facilitates user access to a device's media capture 
+#'   mechanism, such as a camera, or microphone, from within a file upload 
+#'   control.
 #'
+#'   A value of `user` indicates that the user-facing camera and/or microphone
+#'   should be used. A value of `environment` specifies that the outward-facing
+#'   camera and/or microphone should be used.
+#'
+#'   By default on most phones, this will accept still photos or video. For
+#'   still photos only, also use `accept="image/*"`. For video only, use
+#'   `accept="video/*"`.
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -73,7 +84,8 @@
 #'
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
-  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
+  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected",
+  capture = NULL) {

  restoredValue <- restoreInput(id = inputId, default = NULL)

@@ -101,6 +113,9 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
  if (length(accept) > 0)
    inputTag$attribs$accept <- paste(accept, collapse=',')

+  if (!is.null(capture)) {
+    inputTag$attribs$capture <- capture
+  }

  div(class = "form-group shiny-input-container",
    style = css(width = validateCssUnit(width)),
--- a/R/reactives.R
+++ b/R/reactives.R
@@ -2472,11 +2472,11 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai

      # Ensure r() is called only after setting firstRun to FALSE since r()
      # may throw an error
-      r()
+      try(r(), silent = TRUE)
      return()
    }
    # This ensures r() is still tracked after firstRun
-    r()
+    try(r(), silent = TRUE)

    # The value (or possibly millis) changed. Start or reset the timer.
    v$when <- getDomainTimeMs(domain) + millis()
@@ -2509,7 +2509,7 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
  # commenting it out and studying the unit test failure that results.
  primer <- observe({
    primer$destroy()
-    er()
+    try(er(), silent = TRUE)
  }, label = "debounce primer", domain = domain, priority = priority)

  er
@@ -2551,7 +2551,7 @@ throttle <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
  }

  # Responsible for tracking when f() changes.
-  observeEvent(r(), {
+  observeEvent(try(r(), silent = TRUE), {
    if (v$pending) {
      # In a blackout period and someone already scheduled; do nothing
    } else if (blackoutMillisLeft() > 0) {
--- a/R/render-plot.R
+++ b/R/render-plot.R
@@ -34,7 +34,7 @@
 #'   When rendering an inline plot, you must provide numeric values (in pixels)
 #'   to both \code{width} and \code{height}.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
-#'   passed to [grDevices::png()]. Note that this affects the resolution of PNG
+#'   passed to [plotPNG()]. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.
 #' @param alt Alternate text for the HTML `<img>` tag if it cannot be displayed
 #'   or viewed (i.e., the user uses a screen reader). In addition to a character
@@ -44,7 +44,7 @@
 #'   ggplot objects; for other plots, `NA` results in alt text of "Plot object".
 #'   `NULL` or `""` is not recommended because those should be limited to
 #'   decorative images.
-#' @param ... Arguments to be passed through to [grDevices::png()].
+#' @param ... Arguments to be passed through to [plotPNG()].
 #'   These can be used to set the width, height, background color, etc.
 #' @inheritParams renderUI
 #' @param execOnResize If `FALSE` (the default), then when a plot is
--- a/R/shiny-options.R
+++ b/R/shiny-options.R
@@ -94,6 +94,10 @@ getShinyOption <- function(name, default = NULL) {
 #'   numbers to JSON format to send to the client web browser.}
 #' \item{shiny.launch.browser (defaults to `interactive()`)}{A boolean which controls the default behavior
 #'   when an app is run. See [runApp()] for more information.}
+#' \item{shiny.mathjax.url (defaults to `"https://mathjax.rstudio.com/latest/MathJax.js"`)}{
+#'   The URL that should be used to load MathJax, via [withMathJax()].}
+#' \item{shiny.mathjax.config (defaults to `"config=TeX-AMS-MML_HTMLorMML"`)}{The querystring
+#'   used to load MathJax, via [withMathJax()].}
 #' \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
 #'   web request size, which serves as a size limit for file uploads.}
 #' \item{shiny.minified (defaults to `TRUE`)}{By default
@@ -136,9 +140,10 @@ getShinyOption <- function(name, default = NULL) {
 #'   messages).}
 #' \item{shiny.autoload.r (defaults to `TRUE`)}{If `TRUE`, then the R/
 #'   of a shiny app will automatically be sourced.}
-#' \item{shiny.usecairo (defaults to `TRUE`)}{This is used to disable graphical rendering by the
-#'   Cairo package, if it is installed. See [plotPNG()] for more
-#'   information.}
+#' \item{shiny.useragg (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
+#'   ragg package. See [plotPNG()] for more information.}
+#' \item{shiny.usecairo (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
+#'   Cairo package. See [plotPNG()] for more information.}
 #' \item{shiny.devmode (defaults to `NULL`)}{Option to enable Shiny Developer Mode. When set,
 #'   different default `getOption(key)` values will be returned. See [devmode()] for more details.}
 ### Not documenting as 'shiny.devmode.verbose' is for niche use only
--- a/R/shinyapp.R
+++ b/R/shinyapp.R
@@ -286,7 +286,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 #
 # The return value is a function that halts monitoring when called.
 initAutoReloadMonitor <- function(dir) {
-  if (!getOption("shiny.autoreload", FALSE)) {
+  if (!get_devmode_option("shiny.autoreload", FALSE)) {
    return(function(){})
  }

@@ -339,7 +339,7 @@ initAutoReloadMonitor <- function(dir) {
 #' @param appDir The application directory. If `appDir` is `NULL` or
 #'   not supplied, the nearest enclosing directory that is a Shiny app, starting
 #'   with the current directory, is used.
-#' @param renv The environmeny in which the files in the `R/` directory should
+#' @param renv The environment in which the files in the `R/` directory should
 #'   be evaluated.
 #' @param globalrenv The environment in which `global.R` should be evaluated. If
 #'   `NULL`, `global.R` will not be evaluated at all.
--- a/R/shinyui.R
+++ b/R/shinyui.R
@@ -14,7 +14,11 @@ NULL
 #' # now we can just write "static" content without withMathJax()
 #' div("more math here $$\\sqrt{2}$$")
 withMathJax <- function(...) {
-  path <- 'https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
+  path <- paste0(
+    getOption("shiny.mathjax.url", "https://mathjax.rstudio.com/latest/MathJax.js"),
+    "?",
+    getOption("shiny.mathjax.config", "config=TeX-AMS-MML_HTMLorMML")
+  )
  tagList(
    tags$head(
      singleton(tags$script(src = path, type = 'text/javascript'))
--- a/R/shinywrappers.R
+++ b/R/shinywrappers.R
@@ -778,9 +778,9 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #'   function.)
 #' @param contentType A string of the download's
 #'   [content type](https://en.wikipedia.org/wiki/Internet_media_type), for
-#'   example `"text/csv"` or `"image/png"`. If `NULL` or
-#'   `NA`, the content type will be guessed based on the filename
-#'   extension, or `application/octet-stream` if the extension is unknown.
+#'   example `"text/csv"` or `"image/png"`. If `NULL`, the content type 
+#'   will be guessed based on the filename extension, or 
+#'   `application/octet-stream` if the extension is unknown.
 #' @param outputArgs A list of arguments to be passed through to the implicit
 #'   call to [downloadButton()] when `downloadHandler` is used
 #'   in an interactive R Markdown document.
@@ -810,7 +810,7 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #' shinyApp(ui, server)
 #' }
 #' @export
-downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()) {
+downloadHandler <- function(filename, content, contentType=NULL, outputArgs=list()) {
  renderFunc <- function(shinysession, name, ...) {
    shinysession$registerDownload(name, filename, contentType, content)
  }
--- a/inst/app_template/tests/shinytest.R
+++ b/inst/app_template/tests/shinytest.R
@@ -1,2 +0,0 @@
-library(shinytest)
-expect_pass(testApp("../", suffix = osName()))
--- a/inst/app_template/tests/shinytest/mytest.R
+++ b/inst/app_template/tests/shinytest/mytest.R
@@ -1,12 +0,0 @@
-app <- ShinyDriver$new("../../")
-app$snapshotInit("mytest")
-
-app$snapshot()
-{{
-if (isTRUE(module)) {
-'
-app$setInputs(`examplemodule1-button` = "click")
-app$setInputs(`examplemodule1-button` = "click")
-app$snapshot()'
-}
-}}
--- a/inst/app_template/tests/testthat.R
+++ b/inst/app_template/tests/testthat.R
@@ -1,9 +1 @@
-library(testthat)
-
-test_dir(
-  "./testthat",
-  # Run in the app's environment containing all support methods.
-  env = shiny::loadSupport(),
-  # Display the regular progress output and throw an error if any test error is found
-  reporter = c("progress", "fail")
-)
+shinytest2::test_app()
--- a/inst/app_template/tests/testthat/test-server.R
+++ b/inst/app_template/tests/testthat/test-server.R
@@ -14,5 +14,4 @@ if (isTRUE(rdir)) {
  expect_equal(output$sequence, "1 2 3 4 5 6 7 8 9 10 11 12")
 '
 }
-}}
-})
+}}})
--- a/inst/app_template/tests/testthat/test-shinytest2.R
+++ b/inst/app_template/tests/testthat/test-shinytest2.R
@@ -0,0 +1,18 @@
+library(shinytest2)
+
+test_that("Initial snapshot values are consistent", {
+  app <- AppDriver$new(name = "init")
+  app$expect_values()
+}){{
+if (isTRUE(module)) {
+HTML('
+
+
+test_that("Module values are consistent", {
+  app <- AppDriver$new(name = "mod")
+  app$click("examplemodule1-button")
+  app$click("examplemodule1-button")
+  app$expect_values()
+})')
+}
+}}
--- a/inst/www/shared/shiny-autoreload.js
+++ b/inst/www/shared/shiny-autoreload.js
--- a/inst/www/shared/shiny-autoreload.js.map
+++ b/inst/www/shared/shiny-autoreload.js.map
--- a/inst/www/shared/shiny-showcase.js
+++ b/inst/www/shared/shiny-showcase.js
--- a/inst/www/shared/shiny-showcase.js.map
+++ b/inst/www/shared/shiny-showcase.js.map
--- a/inst/www/shared/shiny-testmode.js
+++ b/inst/www/shared/shiny-testmode.js
@@ -1,3 +1,3 @@
 /*! shiny 1.7.1.9003 | (c) 2012-2022 RStudio, PBC. | License: GPL-3 | file LICENSE */
 (function(){var a=eval;window.addEventListener("message",function(i){var e=i.data;e.code&&a(e.code)});})();
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjdHMvc3JjL3V0aWxzL2V2YWwudHMiLCAiLi4vLi4vLi4vc3JjdHMvZXh0cmFzL3NoaW55LXRlc3Rtb2RlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyIvL2VzYnVpbGQuZ2l0aHViLmlvL2NvbnRlbnQtdHlwZXMvI2RpcmVjdC1ldmFsXG4vL3RsL2RyO1xuLy8gKiBEaXJlY3QgdXNhZ2Ugb2YgYGV2YWwoXCJ4XCIpYCBpcyBiYWQgd2l0aCBidW5kbGVkIGNvZGUuXG4vLyAqIEluc3RlYWQsIHVzZSBpbmRpcmVjdCBjYWxscyB0byBgZXZhbGAgc3VjaCBhcyBgaW5kaXJlY3RFdmFsKFwieFwiKWBcbi8vICAgKiBFdmVuIGp1c3QgcmVuYW1pbmcgdGhlIGZ1bmN0aW9uIHdvcmtzIHdlbGwgZW5vdWdoLlxuLy8gPiBUaGlzIGlzIGtub3duIGFzIFwiaW5kaXJlY3QgZXZhbFwiIGJlY2F1c2UgZXZhbCBpcyBub3QgYmVpbmcgY2FsbGVkIGRpcmVjdGx5LCBhbmQgc28gZG9lcyBub3QgdHJpZ2dlciB0aGUgZ3JhbW1hdGljYWwgc3BlY2lhbCBjYXNlIGZvciBkaXJlY3QgZXZhbCBpbiB0aGUgSmF2YVNjcmlwdCBWTS4gWW91IGNhbiBjYWxsIGluZGlyZWN0IGV2YWwgdXNpbmcgYW55IHN5bnRheCBhdCBhbGwgZXhjZXB0IGZvciBhbiBleHByZXNzaW9uIG9mIHRoZSBleGFjdCBmb3JtIGV2YWwoJ3gnKS4gRm9yIGV4YW1wbGUsIHZhciBldmFsMiA9IGV2YWw7IGV2YWwyKCd4JykgYW5kIFtldmFsXVswXSgneCcpIGFuZCB3aW5kb3cuZXZhbCgneCcpIGFyZSBhbGwgaW5kaXJlY3QgZXZhbCBjYWxscy5cbi8vID4gV2hlbiB5b3UgdXNlIGluZGlyZWN0IGV2YWwsIHRoZSBjb2RlIGlzIGV2YWx1YXRlZCBpbiB0aGUgZ2xvYmFsIHNjb3BlIGluc3RlYWQgb2YgaW4gdGhlIGlubGluZSBzY29wZSBvZiB0aGUgY2FsbGVyLlxudmFyIGluZGlyZWN0RXZhbCA9IGV2YWw7XG5leHBvcnQgeyBpbmRpcmVjdEV2YWwgfTsiLCAiLyogZXNsaW50LWRpc2FibGUgdW5pY29ybi9maWxlbmFtZS1jYXNlICovXG5pbXBvcnQgeyBpbmRpcmVjdEV2YWwgfSBmcm9tIFwiLi4vc3JjL3V0aWxzL2V2YWxcIjsgLy8gTGlzdGVuIGZvciBtZXNzYWdlcyBmcm9tIHBhcmVudCBmcmFtZS4gVGhpcyBmaWxlIGlzIG9ubHkgYWRkZWQgd2hlbiB0aGVcbi8vIHNoaW55LnRlc3Rtb2RlIG9wdGlvbiBpcyBUUlVFLlxuXG53aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcihcIm1lc3NhZ2VcIiwgZnVuY3Rpb24gKGUpIHtcbiAgdmFyIG1lc3NhZ2UgPSBlLmRhdGE7XG4gIGlmIChtZXNzYWdlLmNvZGUpIGluZGlyZWN0RXZhbChtZXNzYWdlLmNvZGUpO1xufSk7Il0sCiAgIm1hcHBpbmdzIjogIjtZQU9BLEdBQUksR0FBZSxLQ0huQixPQUFPLGlCQUFpQixVQUFXLFNBQVUsRUFBRyxDQUM5QyxHQUFJLEdBQVUsRUFBRSxLQUNoQixBQUFJLEVBQVEsTUFBTSxFQUFhLEVBQVEiLAogICJuYW1lcyI6IFtdCn0K
+//# sourceMappingURL=shiny-testmode.js.map
--- a/inst/www/shared/shiny-testmode.js.map
+++ b/inst/www/shared/shiny-testmode.js.map
@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../srcts/src/utils/eval.ts", "../../../srcts/extras/shiny-testmode.ts"],
+  "sourcesContent": ["//esbuild.github.io/content-types/#direct-eval\n//tl/dr;\n// * Direct usage of `eval(\"x\")` is bad with bundled code.\n// * Instead, use indirect calls to `eval` such as `indirectEval(\"x\")`\n//   * Even just renaming the function works well enough.\n// > This is known as \"indirect eval\" because eval is not being called directly, and so does not trigger the grammatical special case for direct eval in the JavaScript VM. You can call indirect eval using any syntax at all except for an expression of the exact form eval('x'). For example, var eval2 = eval; eval2('x') and [eval][0]('x') and window.eval('x') are all indirect eval calls.\n// > When you use indirect eval, the code is evaluated in the global scope instead of in the inline scope of the caller.\nvar indirectEval = eval;\nexport { indirectEval };", "/* eslint-disable unicorn/filename-case */\nimport { indirectEval } from \"../src/utils/eval\"; // Listen for messages from parent frame. This file is only added when the\n// shiny.testmode option is TRUE.\n\nwindow.addEventListener(\"message\", function (e) {\n  var message = e.data;\n  if (message.code) indirectEval(message.code);\n});"],
+  "mappings": ";YAOA,GAAI,GAAe,KCHnB,OAAO,iBAAiB,UAAW,SAAU,EAAG,CAC9C,GAAI,GAAU,EAAE,KAChB,AAAI,EAAQ,MAAM,EAAa,EAAQ",
+  "names": []
+}
--- a/inst/www/shared/shiny.js
+++ b/inst/www/shared/shiny.js
--- a/inst/www/shared/shiny.js.map
+++ b/inst/www/shared/shiny.js.map
--- a/inst/www/shared/shiny.min.js
+++ b/inst/www/shared/shiny.min.js
--- a/inst/www/shared/shiny.min.js.map
+++ b/inst/www/shared/shiny.min.js.map
--- a/man/MockShinySession.Rd
+++ b/man/MockShinySession.Rd
@@ -85,40 +85,40 @@ user. Always \code{NULL} for a \code{MockShinySesion}.}
 \section{Methods}{
 \subsection{Public methods}{
 \itemize{
-\item \href{#method-new}{\code{MockShinySession$new()}}
-\item \href{#method-onFlush}{\code{MockShinySession$onFlush()}}
-\item \href{#method-onFlushed}{\code{MockShinySession$onFlushed()}}
-\item \href{#method-onEnded}{\code{MockShinySession$onEnded()}}
-\item \href{#method-isEnded}{\code{MockShinySession$isEnded()}}
-\item \href{#method-isClosed}{\code{MockShinySession$isClosed()}}
-\item \href{#method-close}{\code{MockShinySession$close()}}
-\item \href{#method-cycleStartAction}{\code{MockShinySession$cycleStartAction()}}
-\item \href{#method-fileUrl}{\code{MockShinySession$fileUrl()}}
-\item \href{#method-setInputs}{\code{MockShinySession$setInputs()}}
-\item \href{#method-.scheduleTask}{\code{MockShinySession$.scheduleTask()}}
-\item \href{#method-elapse}{\code{MockShinySession$elapse()}}
-\item \href{#method-.now}{\code{MockShinySession$.now()}}
-\item \href{#method-defineOutput}{\code{MockShinySession$defineOutput()}}
-\item \href{#method-getOutput}{\code{MockShinySession$getOutput()}}
-\item \href{#method-ns}{\code{MockShinySession$ns()}}
-\item \href{#method-flushReact}{\code{MockShinySession$flushReact()}}
-\item \href{#method-makeScope}{\code{MockShinySession$makeScope()}}
-\item \href{#method-setEnv}{\code{MockShinySession$setEnv()}}
-\item \href{#method-setReturned}{\code{MockShinySession$setReturned()}}
-\item \href{#method-getReturned}{\code{MockShinySession$getReturned()}}
-\item \href{#method-genId}{\code{MockShinySession$genId()}}
-\item \href{#method-rootScope}{\code{MockShinySession$rootScope()}}
-\item \href{#method-unhandledError}{\code{MockShinySession$unhandledError()}}
-\item \href{#method-freezeValue}{\code{MockShinySession$freezeValue()}}
-\item \href{#method-onSessionEnded}{\code{MockShinySession$onSessionEnded()}}
-\item \href{#method-registerDownload}{\code{MockShinySession$registerDownload()}}
-\item \href{#method-getCurrentOutputInfo}{\code{MockShinySession$getCurrentOutputInfo()}}
-\item \href{#method-clone}{\code{MockShinySession$clone()}}
+\item \href{#method-MockShinySession-new}{\code{MockShinySession$new()}}
+\item \href{#method-MockShinySession-onFlush}{\code{MockShinySession$onFlush()}}
+\item \href{#method-MockShinySession-onFlushed}{\code{MockShinySession$onFlushed()}}
+\item \href{#method-MockShinySession-onEnded}{\code{MockShinySession$onEnded()}}
+\item \href{#method-MockShinySession-isEnded}{\code{MockShinySession$isEnded()}}
+\item \href{#method-MockShinySession-isClosed}{\code{MockShinySession$isClosed()}}
+\item \href{#method-MockShinySession-close}{\code{MockShinySession$close()}}
+\item \href{#method-MockShinySession-cycleStartAction}{\code{MockShinySession$cycleStartAction()}}
+\item \href{#method-MockShinySession-fileUrl}{\code{MockShinySession$fileUrl()}}
+\item \href{#method-MockShinySession-setInputs}{\code{MockShinySession$setInputs()}}
+\item \href{#method-MockShinySession-.scheduleTask}{\code{MockShinySession$.scheduleTask()}}
+\item \href{#method-MockShinySession-elapse}{\code{MockShinySession$elapse()}}
+\item \href{#method-MockShinySession-.now}{\code{MockShinySession$.now()}}
+\item \href{#method-MockShinySession-defineOutput}{\code{MockShinySession$defineOutput()}}
+\item \href{#method-MockShinySession-getOutput}{\code{MockShinySession$getOutput()}}
+\item \href{#method-MockShinySession-ns}{\code{MockShinySession$ns()}}
+\item \href{#method-MockShinySession-flushReact}{\code{MockShinySession$flushReact()}}
+\item \href{#method-MockShinySession-makeScope}{\code{MockShinySession$makeScope()}}
+\item \href{#method-MockShinySession-setEnv}{\code{MockShinySession$setEnv()}}
+\item \href{#method-MockShinySession-setReturned}{\code{MockShinySession$setReturned()}}
+\item \href{#method-MockShinySession-getReturned}{\code{MockShinySession$getReturned()}}
+\item \href{#method-MockShinySession-genId}{\code{MockShinySession$genId()}}
+\item \href{#method-MockShinySession-rootScope}{\code{MockShinySession$rootScope()}}
+\item \href{#method-MockShinySession-unhandledError}{\code{MockShinySession$unhandledError()}}
+\item \href{#method-MockShinySession-freezeValue}{\code{MockShinySession$freezeValue()}}
+\item \href{#method-MockShinySession-onSessionEnded}{\code{MockShinySession$onSessionEnded()}}
+\item \href{#method-MockShinySession-registerDownload}{\code{MockShinySession$registerDownload()}}
+\item \href{#method-MockShinySession-getCurrentOutputInfo}{\code{MockShinySession$getCurrentOutputInfo()}}
+\item \href{#method-MockShinySession-clone}{\code{MockShinySession$clone()}}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-new"></a>}}
-\if{latex}{\out{\hypertarget{method-new}{}}}
+\if{html}{\out{<a id="method-MockShinySession-new"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-new}{}}}
 \subsection{Method \code{new()}}{
 Create a new MockShinySession.
 \subsection{Usage}{
@@ -127,8 +127,8 @@ Create a new MockShinySession.

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onFlush"></a>}}
-\if{latex}{\out{\hypertarget{method-onFlush}{}}}
+\if{html}{\out{<a id="method-MockShinySession-onFlush"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-onFlush}{}}}
 \subsection{Method \code{onFlush()}}{
 Define a callback to be invoked before a reactive flush
 \subsection{Usage}{
@@ -146,8 +146,8 @@ Define a callback to be invoked before a reactive flush
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onFlushed"></a>}}
-\if{latex}{\out{\hypertarget{method-onFlushed}{}}}
+\if{html}{\out{<a id="method-MockShinySession-onFlushed"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-onFlushed}{}}}
 \subsection{Method \code{onFlushed()}}{
 Define a callback to be invoked after a reactive flush
 \subsection{Usage}{
@@ -165,8 +165,8 @@ Define a callback to be invoked after a reactive flush
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-onEnded}{}}}
+\if{html}{\out{<a id="method-MockShinySession-onEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-onEnded}{}}}
 \subsection{Method \code{onEnded()}}{
 Define a callback to be invoked when the session ends
 \subsection{Usage}{
@@ -182,8 +182,8 @@ Define a callback to be invoked when the session ends
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-isEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-isEnded}{}}}
+\if{html}{\out{<a id="method-MockShinySession-isEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-isEnded}{}}}
 \subsection{Method \code{isEnded()}}{
 Returns \code{FALSE} if the session has not yet been closed
 \subsection{Usage}{
@@ -192,8 +192,8 @@ Returns \code{FALSE} if the session has not yet been closed

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-isClosed"></a>}}
-\if{latex}{\out{\hypertarget{method-isClosed}{}}}
+\if{html}{\out{<a id="method-MockShinySession-isClosed"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-isClosed}{}}}
 \subsection{Method \code{isClosed()}}{
 Returns \code{FALSE} if the session has not yet been closed
 \subsection{Usage}{
@@ -202,8 +202,8 @@ Returns \code{FALSE} if the session has not yet been closed

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-close"></a>}}
-\if{latex}{\out{\hypertarget{method-close}{}}}
+\if{html}{\out{<a id="method-MockShinySession-close"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-close}{}}}
 \subsection{Method \code{close()}}{
 Closes the session
 \subsection{Usage}{
@@ -212,8 +212,8 @@ Closes the session

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-cycleStartAction"></a>}}
-\if{latex}{\out{\hypertarget{method-cycleStartAction}{}}}
+\if{html}{\out{<a id="method-MockShinySession-cycleStartAction"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-cycleStartAction}{}}}
 \subsection{Method \code{cycleStartAction()}}{
 Unsophisticated mock implementation that merely invokes
 \subsection{Usage}{
@@ -229,8 +229,8 @@ Unsophisticated mock implementation that merely invokes
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-fileUrl"></a>}}
-\if{latex}{\out{\hypertarget{method-fileUrl}{}}}
+\if{html}{\out{<a id="method-MockShinySession-fileUrl"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-fileUrl}{}}}
 \subsection{Method \code{fileUrl()}}{
 Base64-encode the given file. Needed for image rendering.
 \subsection{Usage}{
@@ -250,8 +250,8 @@ Base64-encode the given file. Needed for image rendering.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setInputs"></a>}}
-\if{latex}{\out{\hypertarget{method-setInputs}{}}}
+\if{html}{\out{<a id="method-MockShinySession-setInputs"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-setInputs}{}}}
 \subsection{Method \code{setInputs()}}{
 Sets reactive values associated with the \code{session$inputs}
 object and flushes the reactives.
@@ -280,8 +280,8 @@ session$setInputs(x=1, y=2)

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-.scheduleTask"></a>}}
-\if{latex}{\out{\hypertarget{method-.scheduleTask}{}}}
+\if{html}{\out{<a id="method-MockShinySession-.scheduleTask"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-.scheduleTask}{}}}
 \subsection{Method \code{.scheduleTask()}}{
 An internal method which shouldn't be used by others.
 Schedules \code{callback} for execution after some number of \code{millis}
@@ -301,8 +301,8 @@ milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-elapse"></a>}}
-\if{latex}{\out{\hypertarget{method-elapse}{}}}
+\if{html}{\out{<a id="method-MockShinySession-elapse"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-elapse}{}}}
 \subsection{Method \code{elapse()}}{
 Simulate the passing of time by the given number of milliseconds.
 \subsection{Usage}{
@@ -318,8 +318,8 @@ Simulate the passing of time by the given number of milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-.now"></a>}}
-\if{latex}{\out{\hypertarget{method-.now}{}}}
+\if{html}{\out{<a id="method-MockShinySession-.now"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-.now}{}}}
 \subsection{Method \code{.now()}}{
 An internal method which shouldn't be used by others.
 \subsection{Usage}{
@@ -331,8 +331,8 @@ Elapsed time in milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-defineOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-defineOutput}{}}}
+\if{html}{\out{<a id="method-MockShinySession-defineOutput"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-defineOutput}{}}}
 \subsection{Method \code{defineOutput()}}{
 An internal method which shouldn't be used by others.
 Defines an output in a way that sets private$currentOutputName
@@ -354,8 +354,8 @@ appropriately.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-getOutput}{}}}
+\if{html}{\out{<a id="method-MockShinySession-getOutput"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-getOutput}{}}}
 \subsection{Method \code{getOutput()}}{
 An internal method which shouldn't be used by others. Forces
 evaluation of any reactive dependencies of the output function.
@@ -376,8 +376,8 @@ output.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-ns"></a>}}
-\if{latex}{\out{\hypertarget{method-ns}{}}}
+\if{html}{\out{<a id="method-MockShinySession-ns"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-ns}{}}}
 \subsection{Method \code{ns()}}{
 Returns the given id prefixed by this namespace's id.
 \subsection{Usage}{
@@ -396,8 +396,8 @@ The id with a namespace prefix.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-flushReact"></a>}}
-\if{latex}{\out{\hypertarget{method-flushReact}{}}}
+\if{html}{\out{<a id="method-MockShinySession-flushReact"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-flushReact}{}}}
 \subsection{Method \code{flushReact()}}{
 Trigger a reactive flush right now.
 \subsection{Usage}{
@@ -406,8 +406,8 @@ Trigger a reactive flush right now.

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-makeScope"></a>}}
-\if{latex}{\out{\hypertarget{method-makeScope}{}}}
+\if{html}{\out{<a id="method-MockShinySession-makeScope"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-makeScope}{}}}
 \subsection{Method \code{makeScope()}}{
 Create and return a namespace-specific session proxy.
 \subsection{Usage}{
@@ -426,8 +426,8 @@ A new session proxy.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setEnv"></a>}}
-\if{latex}{\out{\hypertarget{method-setEnv}{}}}
+\if{html}{\out{<a id="method-MockShinySession-setEnv"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-setEnv}{}}}
 \subsection{Method \code{setEnv()}}{
 Set the environment associated with a testServer() call, but
 only if it has not previously been set. This ensures that only the
@@ -449,8 +449,8 @@ The provided \code{env}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-setReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-setReturned}{}}}
+\if{html}{\out{<a id="method-MockShinySession-setReturned"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-setReturned}{}}}
 \subsection{Method \code{setReturned()}}{
 Set the value returned by the module call and proactively
 flush. Note that this method may be called multiple times if modules
@@ -472,8 +472,8 @@ The provided \code{value}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-getReturned}{}}}
+\if{html}{\out{<a id="method-MockShinySession-getReturned"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-getReturned}{}}}
 \subsection{Method \code{getReturned()}}{
 Get the value returned by the module call.
 \subsection{Usage}{
@@ -485,8 +485,8 @@ The value returned by the module call
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-genId"></a>}}
-\if{latex}{\out{\hypertarget{method-genId}{}}}
+\if{html}{\out{<a id="method-MockShinySession-genId"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-genId}{}}}
 \subsection{Method \code{genId()}}{
 Generate a distinct character identifier for use as a proxy
 namespace.
@@ -499,8 +499,8 @@ A character identifier unique to the current session.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-rootScope"></a>}}
-\if{latex}{\out{\hypertarget{method-rootScope}{}}}
+\if{html}{\out{<a id="method-MockShinySession-rootScope"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-rootScope}{}}}
 \subsection{Method \code{rootScope()}}{
 Provides a way to access the root \code{MockShinySession} from
 any descendant proxy.
@@ -513,8 +513,8 @@ The root \code{MockShinySession}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-unhandledError"></a>}}
-\if{latex}{\out{\hypertarget{method-unhandledError}{}}}
+\if{html}{\out{<a id="method-MockShinySession-unhandledError"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-unhandledError}{}}}
 \subsection{Method \code{unhandledError()}}{
 Called by observers when a reactive expression errors.
 \subsection{Usage}{
@@ -530,8 +530,8 @@ Called by observers when a reactive expression errors.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-freezeValue"></a>}}
-\if{latex}{\out{\hypertarget{method-freezeValue}{}}}
+\if{html}{\out{<a id="method-MockShinySession-freezeValue"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-freezeValue}{}}}
 \subsection{Method \code{freezeValue()}}{
 Freeze a value until the flush cycle completes.
 \subsection{Usage}{
@@ -549,8 +549,8 @@ Freeze a value until the flush cycle completes.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-onSessionEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-onSessionEnded}{}}}
+\if{html}{\out{<a id="method-MockShinySession-onSessionEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-onSessionEnded}{}}}
 \subsection{Method \code{onSessionEnded()}}{
 Registers the given callback to be invoked when the session
 is closed (i.e. the connection to the client has been severed). The
@@ -570,8 +570,8 @@ guaranteed.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-registerDownload"></a>}}
-\if{latex}{\out{\hypertarget{method-registerDownload}{}}}
+\if{html}{\out{<a id="method-MockShinySession-registerDownload"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-registerDownload}{}}}
 \subsection{Method \code{registerDownload()}}{
 Associated a downloadable file with the session.
 \subsection{Usage}{
@@ -598,8 +598,8 @@ function.)}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getCurrentOutputInfo"></a>}}
-\if{latex}{\out{\hypertarget{method-getCurrentOutputInfo}{}}}
+\if{html}{\out{<a id="method-MockShinySession-getCurrentOutputInfo"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-getCurrentOutputInfo}{}}}
 \subsection{Method \code{getCurrentOutputInfo()}}{
 Get information about the output that is currently being
 executed.
@@ -614,8 +614,8 @@ output, or \code{NULL} if no output is currently executing.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-clone}{}}}
+\if{html}{\out{<a id="method-MockShinySession-clone"></a>}}
+\if{latex}{\out{\hypertarget{method-MockShinySession-clone}{}}}
 \subsection{Method \code{clone()}}{
 The objects of this class are cloneable with this method.
 \subsection{Usage}{
--- a/man/Progress.Rd
+++ b/man/Progress.Rd
@@ -62,19 +62,19 @@ shinyApp(ui, server)
 \section{Methods}{
 \subsection{Public methods}{
 \itemize{
-\item \href{#method-new}{\code{Progress$new()}}
-\item \href{#method-set}{\code{Progress$set()}}
-\item \href{#method-inc}{\code{Progress$inc()}}
-\item \href{#method-getMin}{\code{Progress$getMin()}}
-\item \href{#method-getMax}{\code{Progress$getMax()}}
-\item \href{#method-getValue}{\code{Progress$getValue()}}
-\item \href{#method-close}{\code{Progress$close()}}
-\item \href{#method-clone}{\code{Progress$clone()}}
+\item \href{#method-Progress-new}{\code{Progress$new()}}
+\item \href{#method-Progress-set}{\code{Progress$set()}}
+\item \href{#method-Progress-inc}{\code{Progress$inc()}}
+\item \href{#method-Progress-getMin}{\code{Progress$getMin()}}
+\item \href{#method-Progress-getMax}{\code{Progress$getMax()}}
+\item \href{#method-Progress-getValue}{\code{Progress$getValue()}}
+\item \href{#method-Progress-close}{\code{Progress$close()}}
+\item \href{#method-Progress-clone}{\code{Progress$clone()}}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-new"></a>}}
-\if{latex}{\out{\hypertarget{method-new}{}}}
+\if{html}{\out{<a id="method-Progress-new"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-new}{}}}
 \subsection{Method \code{new()}}{
 Creates a new progress panel (but does not display it).
 \subsection{Usage}{
@@ -107,8 +107,8 @@ is for backward-compatibility).}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-set"></a>}}
-\if{latex}{\out{\hypertarget{method-set}{}}}
+\if{html}{\out{<a id="method-Progress-set"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-set}{}}}
 \subsection{Method \code{set()}}{
 Updates the progress panel. When called the first time, the
 progress panel is displayed.
@@ -135,8 +135,8 @@ relative to \code{message}.}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-inc"></a>}}
-\if{latex}{\out{\hypertarget{method-inc}{}}}
+\if{html}{\out{<a id="method-Progress-inc"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-inc}{}}}
 \subsection{Method \code{inc()}}{
 Like \code{set}, this updates the progress panel. The difference
 is that \code{inc} increases the progress bar by \code{amount}, instead of
@@ -163,8 +163,8 @@ relative to \code{message}.}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getMin"></a>}}
-\if{latex}{\out{\hypertarget{method-getMin}{}}}
+\if{html}{\out{<a id="method-Progress-getMin"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-getMin}{}}}
 \subsection{Method \code{getMin()}}{
 Returns the minimum value.
 \subsection{Usage}{
@@ -173,8 +173,8 @@ Returns the minimum value.

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getMax"></a>}}
-\if{latex}{\out{\hypertarget{method-getMax}{}}}
+\if{html}{\out{<a id="method-Progress-getMax"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-getMax}{}}}
 \subsection{Method \code{getMax()}}{
 Returns the maximum value.
 \subsection{Usage}{
@@ -183,8 +183,8 @@ Returns the maximum value.

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-getValue"></a>}}
-\if{latex}{\out{\hypertarget{method-getValue}{}}}
+\if{html}{\out{<a id="method-Progress-getValue"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-getValue}{}}}
 \subsection{Method \code{getValue()}}{
 Returns the current value.
 \subsection{Usage}{
@@ -193,8 +193,8 @@ Returns the current value.

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-close"></a>}}
-\if{latex}{\out{\hypertarget{method-close}{}}}
+\if{html}{\out{<a id="method-Progress-close"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-close}{}}}
 \subsection{Method \code{close()}}{
 Removes the progress panel. Future calls to \code{set} and
 \code{close} will be ignored.
@@ -204,8 +204,8 @@ Removes the progress panel. Future calls to \code{set} and

 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-clone}{}}}
+\if{html}{\out{<a id="method-Progress-clone"></a>}}
+\if{latex}{\out{\hypertarget{method-Progress-clone}{}}}
 \subsection{Method \code{clone()}}{
 The objects of this class are cloneable with this method.
 \subsection{Usage}{
--- a/man/bindCache.Rd
+++ b/man/bindCache.Rd
@@ -40,7 +40,9 @@ sense, namely:

 In the example here, the \code{bindCache()} key consists of \code{input$x} and
 \code{input$y} combined, and the value is \code{input$x * input$y}. In this simple
-example, for any given key, there is only one possible returned value.\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
+example, for any given key, there is only one possible returned value.
+
+\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
  bindCache(input$x, input$y)
 }\if{html}{\out{</div>}}

@@ -63,7 +65,9 @@ to do some sort of reduction on the data that still captures information
 about whether a value can be retrieved from the cache. For example, if you
 have a large data set with timestamps, it might make sense to extract the
 most recent timestamp and return that. Then, instead of hashing the entire
-data object, the cached reactive only needs to hash the timestamp.\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ compute(bigdata()) \} \%>\%
+data object, the cached reactive only needs to hash the timestamp.
+
+\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ compute(bigdata()) \} \%>\%
  bindCache(\{ extract_most_recent_time(bigdata()) \})
 }\if{html}{\out{</div>}}

@@ -105,7 +109,9 @@ cache key is not too expensive.
 Remember that the key is \emph{reactive}, so it is not re-executed every single
 time that someone accesses the cached reactive. It is only re-executed if
 it has been invalidated by one of the reactives it depends on. For
-example, suppose we have this cached reactive:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
+example, suppose we have this cached reactive:
+
+\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
 bindCache(input$x, input$y)
 }\if{html}{\out{</div>}}

@@ -154,24 +160,30 @@ persists beyond the current R session.
 To use different settings for an application-scoped cache, you can call
 \code{\link[=shinyOptions]{shinyOptions()}} at the top of your app.R, server.R, or
 global.R. For example, this will create a cache with 500 MB of space
-instead of the default 200 MB:\preformatted{shinyOptions(cache = cachem::cache_mem(max_size = 500e6))
-}
+instead of the default 200 MB:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_mem(max_size = 500e6))
+}\if{html}{\out{</div>}}

 To use different settings for a session-scoped cache, you can set
 \code{self$cache} at the top of your server function. By default, it will create
 a 200 MB memory cache for each session, but you can replace it with
 something different. To use the session-scoped cache, you must also call
 \code{bindCache()} with \code{cache="session"}. This will create a 100 MB cache for
-the session:\preformatted{function(input, output, session) \{
+the session:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{function(input, output, session) \{
  session$cache <- cachem::cache_mem(max_size = 100e6)
  ...
 \}
-}
+}\if{html}{\out{</div>}}

 If you want to use a cache that is shared across multiple R processes, you
 can use a \code{\link[cachem:cache_disk]{cachem::cache_disk()}}. You can create a application-level shared
-cache by putting this at the top of your app.R, server.R, or global.R:\preformatted{shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache"))
-}
+cache by putting this at the top of your app.R, server.R, or global.R:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache"))
+}\if{html}{\out{</div>}}

 This will create a subdirectory in your system temp directory named
 \code{myapp-cache} (replace \code{myapp-cache} with a unique name of
@@ -181,8 +193,10 @@ stops of the R process, as long as you do not reboot.

 To have the cache persist even across multiple reboots, you can create the
 cache in a location outside of the temp directory. For example, it could
-be a subdirectory of the application:\preformatted{shinyOptions(cache = cachem::cache_disk("./myapp-cache"))
-}
+be a subdirectory of the application:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_disk("./myapp-cache"))
+}\if{html}{\out{</div>}}

 In this case, resetting the cache will have to be done manually, by deleting
 the directory.
@@ -247,9 +261,11 @@ You may need to provide a \code{cacheHint} to \code{\link[=createRenderFunction]
 \code{htmlwidgets::shinyRenderWidget()}, if you've authored an htmlwidget) in
 order for \code{bindCache()} to correctly compute a cache key.

-The potential problem is a cache collision. Consider the following:\preformatted{output$x1 <- renderText(\{ input$x \}) \%>\% bindCache(input$x)
+The potential problem is a cache collision. Consider the following:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{output$x1 <- renderText(\{ input$x \}) \%>\% bindCache(input$x)
 output$x2 <- renderText(\{ input$x * 2 \}) \%>\% bindCache(input$x)
-}
+}\if{html}{\out{</div>}}

 Both \code{output$x1} and \code{output$x2} use \code{input$x} as part of their cache key,
 but if it were the only thing used in the cache key, then the two outputs
@@ -258,7 +274,9 @@ this, a \emph{cache hint} is automatically added when \code{\link[=renderText]{r
 \code{\link[=createRenderFunction]{createRenderFunction()}}. The cache hint is used as part of the actual
 cache key, in addition to the one passed to \code{bindCache()} by the user. The
 cache hint can be viewed by calling the internal Shiny function
-\code{extractCacheHint()}:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- renderText(\{ input$x \})
+\code{extractCacheHint()}:
+
+\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- renderText(\{ input$x \})
 shiny:::extractCacheHint(r)
 }\if{html}{\out{</div>}}

@@ -289,7 +307,9 @@ that may influence the final value.
 For \pkg{htmlwidgets}, it will try to automatically infer a cache hint;
 again, you can inspect the cache hint with \code{shiny:::extractCacheHint()} and
 also test it in an application. If you do need to explicitly provide a
-cache hint, pass it to \code{shinyRenderWidget}. For example:\preformatted{renderMyWidget <- function(expr) \{
+cache hint, pass it to \code{shinyRenderWidget}. For example:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{renderMyWidget <- function(expr) \{
  q <- rlang::enquo0(expr)

  htmlwidgets::shinyRenderWidget(
@@ -299,7 +319,7 @@ cache hint, pass it to \code{shinyRenderWidget}. For example:\preformatted{rende
    cacheHint = list(label = "myWidget", userQuo = q)
  )
 \}
-}
+}\if{html}{\out{</div>}}

 If your \code{render} function sets any internal state, you may find it useful
 in your call to \code{\link[=createRenderFunction]{createRenderFunction()}} to use
@@ -330,8 +350,10 @@ For developers of such code, they should call \code{\link[=createRenderFunction]

 When \code{bindCache()} is used with \code{renderPlot()}, the \code{height} and \code{width}
 passed to the original \code{renderPlot()} are ignored. They are superseded by
-\code{sizePolicy} argument passed to `bindCache. The default is:\preformatted{sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2)
-}
+\code{sizePolicy} argument passed to `bindCache. The default is:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2)
+}\if{html}{\out{</div>}}

 \code{sizePolicy} must be a function that takes a two-element numeric vector as
 input, representing the width and height of the \verb{<img>} element in the
--- a/man/bindEvent.Rd
+++ b/man/bindEvent.Rd
@@ -171,7 +171,9 @@ user sets both \code{x} and \code{y}, and then clicks on an \link{actionButton}
 \code{go}.

 To use both caching and events, the object should first be passed to
-\code{bindCache()}, then \code{bindEvent()}. For example:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{
+\code{bindCache()}, then \code{bindEvent()}. For example:
+
+\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{
   Sys.sleep(2)  # Pretend this is an expensive computation
   input$x * input$y
 \}) \%>\%
--- a/man/bootstrapPage.Rd
+++ b/man/bootstrapPage.Rd
@@ -28,7 +28,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI defintion that can be passed to the \link{shinyUI} function.
+A UI definition that can be passed to the \link{shinyUI} function.
 }
 \description{
 Create a Shiny UI page that loads the CSS and JavaScript for
--- a/man/devmode.Rd
+++ b/man/devmode.Rd
@@ -101,7 +101,9 @@ displays a message once every 8 hrs (by default)
 value and Developer message. This registration method allows package
 authors to write one message in a single location.

-For example, the following Shiny Developer Mode options are registered:\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Reload the Shiny app when a sourced R file changes
+For example, the following Shiny Developer Mode options are registered:
+
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Reload the Shiny app when a sourced R file changes
 register_devmode_option(
  "shiny.autoreload",
  "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
@@ -126,7 +128,9 @@ register_devmode_option(
 Other known, non-Shiny Developer Mode options:
 \itemize{
 \item Sass:
-}\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Display the full stack trace when errors occur during Shiny app execution
+}
+
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Display the full stack trace when errors occur during Shiny app execution
 register_devmode_option(
  "sass.cache",
  "Turning off sass cache. To use default caching, call `options(sass.cache = TRUE)`",
@@ -165,7 +169,9 @@ re-implementing these two functions:

 This function should return \code{TRUE} if \code{getOption("shiny.devmode")} is set.
 In addition, we strongly recommend that it also checks to make sure
-\code{testthat} is not testing.\if{html}{\out{<div class="sourceCode r">}}\preformatted{in_devmode <- function() \{
+\code{testthat} is not testing.
+
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{in_devmode <- function() \{
  isTRUE(getOption("shiny.devmode", FALSE)) &&
    !identical(Sys.getenv("TESTTHAT"), "true")
 \}
@@ -201,7 +207,9 @@ recommend displaying a message (\code{devmode_message}) to \code{stderr()} once
 hours using \code{\link[rlang:abort]{rlang::inform()}}. This will keep the author up to date as to
 which Dev Mode options are being altered. To allow developers a chance to
 disable Dev Mode messages, the message should be skipped if
-\code{getOption("shiny.devmode.verbose", TRUE)} is not \code{TRUE}.\if{html}{\out{<div class="sourceCode r">}}\preformatted{get_devmode_option <- function(name, default = NULL, devmode_default, devmode_message) \{
+\code{getOption("shiny.devmode.verbose", TRUE)} is not \code{TRUE}.
+
+\if{html}{\out{<div class="sourceCode r">}}\preformatted{get_devmode_option <- function(name, default = NULL, devmode_default, devmode_message) \{
  if (!in_devmode()) \{
    # Dev Mode disabled, act like `getOption()`
    return(getOption(name, default = default))
--- a/man/diskCache.Rd
+++ b/man/diskCache.Rd
@@ -40,7 +40,7 @@ deleted from disk. If \code{FALSE} (the default), it will do nothing when
 finalized.}

 \item{missing}{A value to return when \code{get(key)} is called but the key is not
-present in the cache. The default is a \code{\link[cachem:reexports]{key_missing()}} object. It is
+present in the cache. The default is a \code{\link[cachem:key_missing]{key_missing()}} object. It is
 actually an expression that is evaluated each time there is a cache miss.
 See section Missing keys for more information.}

--- a/man/downloadHandler.Rd
+++ b/man/downloadHandler.Rd
@@ -4,7 +4,7 @@
 \alias{downloadHandler}
 \title{File Downloads}
 \usage{
-downloadHandler(filename, content, contentType = NA, outputArgs = list())
+downloadHandler(filename, content, contentType = NULL, outputArgs = list())
 }
 \arguments{
 \item{filename}{A string of the filename, including extension, that the
@@ -19,9 +19,9 @@ function.)}

 \item{contentType}{A string of the download's
 \href{https://en.wikipedia.org/wiki/Internet_media_type}{content type}, for
-example \code{"text/csv"} or \code{"image/png"}. If \code{NULL} or
-\code{NA}, the content type will be guessed based on the filename
-extension, or \code{application/octet-stream} if the extension is unknown.}
+example \code{"text/csv"} or \code{"image/png"}. If \code{NULL}, the content type
+will be guessed based on the filename extension, or
+\code{application/octet-stream} if the extension is unknown.}

 \item{outputArgs}{A list of arguments to be passed through to the implicit
 call to \code{\link[=downloadButton]{downloadButton()}} when \code{downloadHandler} is used
--- a/man/fileInput.Rd
+++ b/man/fileInput.Rd
@@ -11,7 +11,8 @@ fileInput(
  accept = NULL,
  width = NULL,
  buttonLabel = "Browse...",
-  placeholder = "No file selected"
+  placeholder = "No file selected",
+  capture = NULL
 )
 }
 \arguments{
@@ -42,6 +43,19 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 object.}

 \item{placeholder}{The text to show before a file has been uploaded.}
+
+\item{capture}{What source to use for capturing image, audio or video data.
+This attribute facilitates user access to a device's media capture
+mechanism, such as a camera, or microphone, from within a file upload
+control.
+
+A value of \code{user} indicates that the user-facing camera and/or microphone
+should be used. A value of \code{environment} specifies that the outward-facing
+camera and/or microphone should be used.
+
+By default on most phones, this will accept still photos or video. For
+still photos only, also use \code{accept="image/*"}. For video only, use
+\code{accept="video/*"}.}
 }
 \description{
 Create a file upload control that can be used to upload one or more files.
--- a/man/fixedPage.Rd
+++ b/man/fixedPage.Rd
@@ -28,7 +28,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI defintion that can be passed to the \link{shinyUI} function.
+A UI definition that can be passed to the \link{shinyUI} function.
 }
 \description{
 Functions for creating fixed page layouts. A fixed page layout consists of
--- a/man/fluidPage.Rd
+++ b/man/fluidPage.Rd
@@ -29,7 +29,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI defintion that can be passed to the \link{shinyUI} function.
+A UI definition that can be passed to the \link{shinyUI} function.
 }
 \description{
 Functions for creating fluid page layouts. A fluid page layout consists of
--- a/man/loadSupport.Rd
+++ b/man/loadSupport.Rd
@@ -15,7 +15,7 @@ loadSupport(
 not supplied, the nearest enclosing directory that is a Shiny app, starting
 with the current directory, is used.}

-\item{renv}{The environmeny in which the files in the \verb{R/} directory should
+\item{renv}{The environment in which the files in the \verb{R/} directory should
 be evaluated.}

 \item{globalrenv}{The environment in which \code{global.R} should be evaluated. If
--- a/man/memoryCache.Rd
+++ b/man/memoryCache.Rd
@@ -30,7 +30,7 @@ value of \code{evict}. Use \code{Inf} for no limit of number of items.}
 when a cache pruning occurs. Currently, \code{"lru"} and \code{"fifo"} are supported.}

 \item{missing}{A value to return when \code{get(key)} is called but the key is not
-present in the cache. The default is a \code{\link[cachem:reexports]{key_missing()}} object. It is
+present in the cache. The default is a \code{\link[cachem:key_missing]{key_missing()}} object. It is
 actually an expression that is evaluated each time there is a cache miss.
 See section Missing keys for more information.}

--- a/man/navbarPage.Rd
+++ b/man/navbarPage.Rd
@@ -89,7 +89,7 @@ is needed if you want to insert/remove or show/hide an entire
 \item{icon}{Optional icon to appear on a \code{navbarMenu} tab.}
 }
 \value{
-A UI defintion that can be passed to the \link{shinyUI} function.
+A UI definition that can be passed to the \link{shinyUI} function.
 }
 \description{
 Create a page that contains a top level navigation bar that can be used to
--- a/man/pageWithSidebar.Rd
+++ b/man/pageWithSidebar.Rd
@@ -14,7 +14,7 @@ pageWithSidebar(headerPanel, sidebarPanel, mainPanel)
 \item{mainPanel}{The \link{mainPanel} containing outputs}
 }
 \value{
-A UI defintion that can be passed to the \link{shinyUI} function
+A UI definition that can be passed to the \link{shinyUI} function
 }
 \description{
 \strong{DEPRECATED}: use \code{\link[=fluidPage]{fluidPage()}} and \code{\link[=sidebarLayout]{sidebarLayout()}} instead.
--- a/man/plotPNG.Rd
+++ b/man/plotPNG.Rd
@@ -2,7 +2,7 @@
 % Please edit documentation in R/imageutils.R
 \name{plotPNG}
 \alias{plotPNG}
-\title{Run a plotting function and save the output as a PNG}
+\title{Capture a plot as a PNG file.}
 \usage{
 plotPNG(
  func,
@@ -23,27 +23,26 @@ extension \code{.png}.}

 \item{height}{Height in pixels.}

-\item{res}{Resolution in pixels per inch. This value is passed to
-\code{\link[grDevices:png]{grDevices::png()}}. Note that this affects the resolution of PNG rendering in
+\item{res}{Resolution in pixels per inch. This value is passed to the
+graphics device. Note that this affects the resolution of PNG rendering in
 R; it won't change the actual ppi of the browser.}

-\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
-These can be used to set the width, height, background color, etc.}
+\item{...}{Arguments to be passed through to the graphics device. These can
+be used to set the width, height, background color, etc.}
+}
+\value{
+A path to the newly generated PNG file.
 }
 \description{
-This function returns the name of the PNG file that it generates. In
-essence, it calls \code{png()}, then \code{func()}, then \code{dev.off()}.
-So \code{func} must be a function that will generate a plot when used this
-way.
+The PNG graphics device used is determined in the following order:
+\itemize{
+\item If the ragg package is installed (and the \code{shiny.useragg} is not
+set to \code{FALSE}), then use \code{\link[ragg:agg_png]{ragg::agg_png()}}.
+\item If a quartz device is available (i.e., \code{capabilities("aqua")} is
+\code{TRUE}), then use \code{png(type = "quartz")}.
+\item If the Cairo package is installed (and the \code{shiny.usecairo} option
+is not set to \code{FALSE}), then use \code{\link[Cairo:Cairo]{Cairo::CairoPNG()}}.
+\item Otherwise, use \code{\link[grDevices:png]{grDevices::png()}}. In this case, Linux and Windows
+may not antialias some point shapes, resulting in poor quality output.
 }
-\details{
-For output, it will try to use the following devices, in this order:
-quartz (via \code{\link[grDevices:png]{grDevices::png()}}), then \code{\link[Cairo:Cairo]{Cairo::CairoPNG()}},
-and finally \code{\link[grDevices:png]{grDevices::png()}}. This is in order of quality of
-output. Notably, plain \code{png} output on Linux and Windows may not
-antialias some point shapes, resulting in poor quality output.
-
-In some cases, \code{Cairo()} provides output that looks worse than
-\code{png()}. To disable Cairo output for an app, use
-\code{options(shiny.usecairo=FALSE)}.
 }
--- a/man/reexports.Rd
+++ b/man/reexports.Rd
@@ -52,6 +52,6 @@ below to see their documentation.
 \describe{
  \item{fastmap}{\code{\link[fastmap:key_missing]{is.key_missing}}, \code{\link[fastmap]{key_missing}}}

-  \item{htmltools}{\code{\link[htmltools]{HTML}}, \code{\link[htmltools:builder]{a}}, \code{\link[htmltools:builder]{br}}, \code{\link[htmltools:builder]{code}}, \code{\link[htmltools:builder]{div}}, \code{\link[htmltools:builder]{em}}, \code{\link[htmltools:builder]{h1}}, \code{\link[htmltools:builder]{h2}}, \code{\link[htmltools:builder]{h3}}, \code{\link[htmltools:builder]{h4}}, \code{\link[htmltools:builder]{h5}}, \code{\link[htmltools:builder]{h6}}, \code{\link[htmltools:builder]{hr}}, \code{\link[htmltools]{htmlTemplate}}, \code{\link[htmltools:builder]{img}}, \code{\link[htmltools:include]{includeCSS}}, \code{\link[htmltools:include]{includeHTML}}, \code{\link[htmltools:include]{includeMarkdown}}, \code{\link[htmltools:include]{includeScript}}, \code{\link[htmltools:include]{includeText}}, \code{\link[htmltools:singleton]{is.singleton}}, \code{\link[htmltools:builder]{p}}, \code{\link[htmltools:builder]{pre}}, \code{\link[htmltools]{singleton}}, \code{\link[htmltools:builder]{span}}, \code{\link[htmltools:builder]{strong}}, \code{\link[htmltools]{suppressDependencies}}, \code{\link[htmltools:builder]{tag}}, \code{\link[htmltools]{tagAppendAttributes}}, \code{\link[htmltools]{tagAppendChild}}, \code{\link[htmltools:tagAppendChild]{tagAppendChildren}}, \code{\link[htmltools:tagAppendAttributes]{tagGetAttribute}}, \code{\link[htmltools:tagAppendAttributes]{tagHasAttribute}}, \code{\link[htmltools]{tagList}}, \code{\link[htmltools:tagAppendChild]{tagSetChildren}}, \code{\link[htmltools:builder]{tags}}, \code{\link[htmltools]{validateCssUnit}}, \code{\link[htmltools]{withTags}}}
+  \item{htmltools}{\code{\link[htmltools:builder]{a}}, \code{\link[htmltools:builder]{br}}, \code{\link[htmltools:builder]{code}}, \code{\link[htmltools:builder]{div}}, \code{\link[htmltools:builder]{em}}, \code{\link[htmltools:builder]{h1}}, \code{\link[htmltools:builder]{h2}}, \code{\link[htmltools:builder]{h3}}, \code{\link[htmltools:builder]{h4}}, \code{\link[htmltools:builder]{h5}}, \code{\link[htmltools:builder]{h6}}, \code{\link[htmltools:builder]{hr}}, \code{\link[htmltools]{HTML}}, \code{\link[htmltools]{htmlTemplate}}, \code{\link[htmltools:builder]{img}}, \code{\link[htmltools:include]{includeCSS}}, \code{\link[htmltools:include]{includeHTML}}, \code{\link[htmltools:include]{includeMarkdown}}, \code{\link[htmltools:include]{includeScript}}, \code{\link[htmltools:include]{includeText}}, \code{\link[htmltools:singleton]{is.singleton}}, \code{\link[htmltools:builder]{p}}, \code{\link[htmltools:builder]{pre}}, \code{\link[htmltools]{singleton}}, \code{\link[htmltools:builder]{span}}, \code{\link[htmltools:builder]{strong}}, \code{\link[htmltools]{suppressDependencies}}, \code{\link[htmltools:builder]{tag}}, \code{\link[htmltools]{tagAppendAttributes}}, \code{\link[htmltools]{tagAppendChild}}, \code{\link[htmltools:tagAppendChild]{tagAppendChildren}}, \code{\link[htmltools:tagAppendAttributes]{tagGetAttribute}}, \code{\link[htmltools:tagAppendAttributes]{tagHasAttribute}}, \code{\link[htmltools]{tagList}}, \code{\link[htmltools:builder]{tags}}, \code{\link[htmltools:tagAppendChild]{tagSetChildren}}, \code{\link[htmltools]{validateCssUnit}}, \code{\link[htmltools]{withTags}}}
 }}

--- a/man/renderCachedPlot.Rd
+++ b/man/renderCachedPlot.Rd
@@ -37,7 +37,7 @@ information on the default sizing policy.}
 (the default), \code{"session"}, or a cache object like a
 \code{\link[cachem:cache_disk]{cachem::cache_disk()}}. See the Cache Scoping section for more information.}

-\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
+\item{...}{Arguments to be passed through to \code{\link[=plotPNG]{plotPNG()}}.
 These can be used to set the width, height, background color, etc.}

 \item{alt}{Alternate text for the HTML \verb{<img>} tag if it cannot be displayed
--- a/man/renderPlot.Rd
+++ b/man/renderPlot.Rd
@@ -35,10 +35,10 @@ When rendering an inline plot, you must provide numeric values (in pixels)
 to both \code{width} and \code{height}.}

 \item{res}{Resolution of resulting plot, in pixels per inch. This value is
-passed to \code{\link[grDevices:png]{grDevices::png()}}. Note that this affects the resolution of PNG
+passed to \code{\link[=plotPNG]{plotPNG()}}. Note that this affects the resolution of PNG
 rendering in R; it won't change the actual ppi of the browser.}

-\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
+\item{...}{Arguments to be passed through to \code{\link[=plotPNG]{plotPNG()}}.
 These can be used to set the width, height, background color, etc.}

 \item{alt}{Alternate text for the HTML \verb{<img>} tag if it cannot be displayed
--- a/man/req.Rd
+++ b/man/req.Rd
@@ -25,26 +25,30 @@ nor displayed in the Shiny app's UI).
 \details{
 The \code{req} function was designed to be used in one of two ways. The first
 is to call it like a statement (ignoring its return value) before attempting
-operations using the required values:\preformatted{rv <- reactiveValues(state = FALSE)
+operations using the required values:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{rv <- reactiveValues(state = FALSE)
 r <- reactive(\{
  req(input$a, input$b, rv$state)
  # Code that uses input$a, input$b, and/or rv$state...
 \})
-}
+}\if{html}{\out{</div>}}

 In this example, if \code{r()} is called and any of \code{input$a},
 \code{input$b}, and \code{rv$state} are \code{NULL}, \code{FALSE}, \code{""},
 etc., then the \code{req} call will trigger an error that propagates all the
 way up to whatever render block or observer is executing.

-The second is to use it to wrap an expression that must be truthy:\preformatted{output$plot <- renderPlot(\{
+The second is to use it to wrap an expression that must be truthy:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{output$plot <- renderPlot(\{
  if (req(input$plotType) == "histogram") \{
    hist(dataset())
  \} else if (input$plotType == "scatter") \{
    qplot(dataset(), aes(x = x, y = y))
  \}
 \})
-}
+}\if{html}{\out{</div>}}

 In this example, \code{req(input$plotType)} first checks that
 \code{input$plotType} is truthy, and if so, returns it. This is a convenient
--- a/man/shinyAppTemplate.Rd
+++ b/man/shinyAppTemplate.Rd
@@ -10,7 +10,7 @@ shinyAppTemplate(path = NULL, examples = "default", dryrun = FALSE)
 \item{path}{Path to create new shiny application template.}

 \item{examples}{Either one of "default", "ask", "all", or any combination of
-"app", "rdir", "module", "shinytest", and "testthat". In an
+"app", "rdir", "module", and "tests". In an
 interactive session, "default" falls back to "ask"; in a non-interactive
 session, "default" falls back to "all". With "ask", this function will
 prompt the user to select which template items will be added to the new app
@@ -25,30 +25,31 @@ This function populates a directory with files for a Shiny application.
 }
 \details{
 In an interactive R session, this function will, by default, prompt the user
-to select which components to add to the application. Choices are\preformatted{1: All
+to select which components to add to the application. Choices are
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{1: All
 2: app.R              : Main application file
 3: R/example.R        : Helper file with R code
 4: R/example-module.R : Example module
-5: tests/shinytest/   : Tests using the shinytest package
-6: tests/testthat/    : Tests using the testthat package
-}
+5: tests/testthat/    : Tests using the testthat and shinytest2 package
+}\if{html}{\out{</div>}}

 If option 1 is selected, the full example application including the
-following files and directories is created:\preformatted{appdir/
+following files and directories is created:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{appdir/
 |- app.R
 |- R
 |   |- example-module.R
 |   `- example.R
 `- tests
-    |- shinytest.R
-    |- shinytest
-    |   `- mytest.R
    |- testthat.R
    `- testthat
        |- test-examplemodule.R
        |- test-server.R
+        |- test-shinytest2.R
        `- test-sort.R
-}
+}\if{html}{\out{</div>}}

 Some notes about these files:
 \itemize{
@@ -62,15 +63,15 @@ and the second contains code for module created by the
 \item \verb{tests/} contains various tests for the application. You may
 choose to use or remove any of them. They can be executed by the
 \code{\link[=runTests]{runTests()}} function.
-\item \code{tests/shinytest.R} is a test runner for test files in the
-\verb{tests/shinytest/} directory.
-\item \code{tests/shinytest/mytest.R} is a test that uses the
-\href{https://rstudio.github.io/shinytest/}{shinytest} package to do
-snapshot-based testing.
 \item \code{tests/testthat.R} is a test runner for test files in the
-\verb{tests/testthat/} directory using the \href{https://testthat.r-lib.org/}{testthat} package.
+\verb{tests/testthat/} directory using the
+\href{https://rstudio.github.io/shinytest2/reference/test_app.html}{shinytest2}
+package.
 \item \code{tests/testthat/test-examplemodule.R} is a test for an application's module server function.
 \item \code{tests/testthat/test-server.R} is a test for the application's server code
+\item \code{tests/testthat/test-shinytest2.R} is a test that uses the
+\href{https://rstudio.github.io/shinytest2/}{shinytest2} package to do
+snapshot-based testing.
 \item \code{tests/testthat/test-sort.R} is a test for a supporting function in the \verb{R/} directory.
 }
 }
--- a/man/shinyOptions.Rd
+++ b/man/shinyOptions.Rd
@@ -73,6 +73,10 @@ then jQuery 3.6.0 is used.}
 numbers to JSON format to send to the client web browser.}
 \item{shiny.launch.browser (defaults to \code{interactive()})}{A boolean which controls the default behavior
 when an app is run. See \code{\link[=runApp]{runApp()}} for more information.}
+\item{shiny.mathjax.url (defaults to \code{"https://mathjax.rstudio.com/latest/MathJax.js"})}{
+The URL that should be used to load MathJax, via \code{\link[=withMathJax]{withMathJax()}}.}
+\item{shiny.mathjax.config (defaults to \code{"config=TeX-AMS-MML_HTMLorMML"})}{The querystring
+used to load MathJax, via \code{\link[=withMathJax]{withMathJax()}}.}
 \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
 web request size, which serves as a size limit for file uploads.}
 \item{shiny.minified (defaults to \code{TRUE})}{By default
@@ -115,9 +119,10 @@ values are \code{"send"} (only print messages sent to the client),
 messages).}
 \item{shiny.autoload.r (defaults to \code{TRUE})}{If \code{TRUE}, then the R/
 of a shiny app will automatically be sourced.}
-\item{shiny.usecairo (defaults to \code{TRUE})}{This is used to disable graphical rendering by the
-Cairo package, if it is installed. See \code{\link[=plotPNG]{plotPNG()}} for more
-information.}
+\item{shiny.useragg (defaults to \code{TRUE})}{Set to \code{FALSE} to prevent PNG rendering via the
+ragg package. See \code{\link[=plotPNG]{plotPNG()}} for more information.}
+\item{shiny.usecairo (defaults to \code{TRUE})}{Set to \code{FALSE} to prevent PNG rendering via the
+Cairo package. See \code{\link[=plotPNG]{plotPNG()}} for more information.}
 \item{shiny.devmode (defaults to \code{NULL})}{Option to enable Shiny Developer Mode. When set,
 different default \code{getOption(key)} values will be returned. See \code{\link[=devmode]{devmode()}} for more details.}
 }
--- a/man/updateCheckboxGroupInput.Rd
+++ b/man/updateCheckboxGroupInput.Rd
@@ -33,17 +33,7 @@ types (such as logicals and numbers) will be coerced to strings.}

 \item{inline}{If \code{TRUE}, render the choices inline (i.e. horizontally)}

-\item{choiceNames}{List of names and values, respectively,
-that are displayed to the user in the app and correspond to the each
-choice (for this reason, \code{choiceNames} and \code{choiceValues}
-must have the same length). If either of these arguments is
-provided, then the other \emph{must} be provided and \code{choices}
-\emph{must not} be provided. The advantage of using both of these over
-a named list for \code{choices} is that \code{choiceNames} allows any
-type of UI object to be passed through (tag objects, icons, HTML code,
-...), instead of just simple text. See Examples.}
-
-\item{choiceValues}{List of names and values, respectively,
+\item{choiceNames, choiceValues}{List of names and values, respectively,
 that are displayed to the user in the app and correspond to the each
 choice (for this reason, \code{choiceNames} and \code{choiceValues}
 must have the same length). If either of these arguments is
--- a/man/updateRadioButtons.Rd
+++ b/man/updateRadioButtons.Rd
@@ -35,16 +35,7 @@ use \code{character(0)}.}

 \item{inline}{If \code{TRUE}, render the choices inline (i.e. horizontally)}

-\item{choiceNames}{List of names and values, respectively, that
-are displayed to the user in the app and correspond to the each choice (for
-this reason, \code{choiceNames} and \code{choiceValues} must have the same length).
-If either of these arguments is provided, then the other \emph{must} be provided
-and \code{choices} \emph{must not} be provided. The advantage of using both of these
-over a named list for \code{choices} is that \code{choiceNames} allows any type of UI
-object to be passed through (tag objects, icons, HTML code, ...), instead
-of just simple text. See Examples.}
-
-\item{choiceValues}{List of names and values, respectively, that
+\item{choiceNames, choiceValues}{List of names and values, respectively, that
 are displayed to the user in the app and correspond to the each choice (for
 this reason, \code{choiceNames} and \code{choiceValues} must have the same length).
 If either of these arguments is provided, then the other \emph{must} be provided
--- a/man/updateSliderInput.Rd
+++ b/man/updateSliderInput.Rd
@@ -29,10 +29,7 @@ updateSliderInput(
 create a regular slider; a length two vector will create a double-ended
 range slider. Must lie between \code{min} and \code{max}.}

-\item{min}{The minimum and maximum values (inclusive) that can be
-selected.}
-
-\item{max}{The minimum and maximum values (inclusive) that can be
+\item{min, max}{The minimum and maximum values (inclusive) that can be
 selected.}

 \item{step}{Specifies the interval between each selectable value on the
--- a/man/validate.Rd
+++ b/man/validate.Rd
@@ -55,10 +55,12 @@ can create your own validation test functions. A passing test should return
 to display to the user, or if the failure should happen silently, \code{FALSE}.

 Alternatively you can use \code{validate()} within an \code{if} statement, which is
-particularly useful for more complex conditions:\preformatted{if (input$x < 0 && input$choice == "positive") \{
+particularly useful for more complex conditions:
+
+\if{html}{\out{<div class="sourceCode">}}\preformatted{if (input$x < 0 && input$choice == "positive") \{
  validate("If choice is positive then x must be greater than 0")
 \}
-}
+}\if{html}{\out{</div>}}
 }

 \examples{
--- a/srcts/README.md
+++ b/srcts/README.md
@@ -8,7 +8,7 @@ yarn add https://github.com/rstudio/shiny\#v1.7.0

 , matching the GitHub tag to your current the Shiny CRAN release (ex: `v1.7.0`).  If you are asked to select a version of `@types/jquery`, please select the closest matching version.

-This will provide a global type defintion of `Shiny`, let your IDE know that `window.Shiny` is of type `Shiny`, and declare a globally available variable `Shiny` within your project. You **should not** need to import anything. Similar to `jQuery`, it should _Just Work_<sup>TM</sup>.
+This will provide a global type definition of `Shiny`, let your IDE know that `window.Shiny` is of type `Shiny`, and declare a globally available variable `Shiny` within your project. You **should not** need to import anything. Similar to `jQuery`, it should _Just Work_<sup>TM</sup>.

 When loading your compiled file, it should be loaded after `shiny.js` is loaded. If you are using an `htmlDependency()` to add your code to the page, your script will automatically be loaded after has been loaded.

@@ -192,7 +192,7 @@ Both JavaScript files will produce a sourcemap (`**.js.map`) that the browser wi

 ### Exported types

-`./extras/globalShiny.ts` contains global declarations to define `window.Shiny`, a globally available `Shiny` variable, and a globally available `Shiny` type. This file is in a parallel folder to `./src` to avoid `Shiny` from being globally accessable within the source code. However, this file is the default type defintion when the Type definitions are installed by external developers.
+`./extras/globalShiny.ts` contains global declarations to define `window.Shiny`, a globally available `Shiny` variable, and a globally available `Shiny` type. This file is in a parallel folder to `./src` to avoid `Shiny` from being globally accessable within the source code. However, this file is the default type definition when the Type definitions are installed by external developers.

 ### GitHub Actions

--- a/srcts/build/extras.ts
+++ b/srcts/build/extras.ts
@@ -10,7 +10,7 @@ import babelPlugin from "esbuild-plugin-babel";

 build({
  bundle: true,
-  sourcemap: "inline",
+  sourcemap: true,
  minify: true,
  plugins: [babelPlugin()],
  banner: banner,
--- a/srcts/extras/shiny-autoreload.ts
+++ b/srcts/extras/shiny-autoreload.ts
@@ -1,14 +1,13 @@
 /* eslint-disable unicorn/filename-case */
-let protocol = "ws:";
+const protocol = (window.location.protocol === "https:") ? "wss:" : "ws:";
+// Add trailing slash to path, if necessary, before appending "autoreload"
+const defaultPath = window.location.pathname.replace(/\/?$/, "/") + "autoreload/";
+const defaultUrl = `${protocol}//${window.location.host}${defaultPath}`;

-if (window.location.protocol === "https:") protocol = "wss:";
-
-let defaultPath = window.location.pathname;
-
-if (!/\/$/.test(defaultPath)) defaultPath += "/";
-defaultPath += "autoreload/";
-
-const ws = new WebSocket(protocol + "//" + window.location.host + defaultPath);
+// By default, use the defaultUrl. But if there's a data-ws-url attribute on our
+// <script> tag, use that instead.
+const wsUrl = document.currentScript.dataset.wsUrl || defaultUrl;
+const ws = new WebSocket(wsUrl);

 ws.onmessage = function (event) {
  if (event.data === "autoreload") {
--- a/srcts/src/bindings/registry.ts
+++ b/srcts/src/bindings/registry.ts
@@ -1,4 +1,5 @@
 import { mergeSort } from "../utils";
+import { Callbacks } from "../utils/callbacks";

 interface BindingBase {
  name: string;
@@ -14,6 +15,7 @@ class BindingRegistry<Binding extends BindingBase> {
  name: string;
  bindings: Array<BindingObj<Binding>> = [];
  bindingNames: { [key: string]: BindingObj<Binding> } = {};
+  registerCallbacks: Callbacks = new Callbacks();

  register(binding: Binding, bindingName: string, priority = 0): void {
    const bindingObj = { binding, priority };
@@ -23,6 +25,12 @@ class BindingRegistry<Binding extends BindingBase> {
      this.bindingNames[bindingName] = bindingObj;
      binding.name = bindingName;
    }
+
+    this.registerCallbacks.invoke();
+  }
+
+  onRegister(fn: () => void, once = true): void {
+    this.registerCallbacks.register(fn, once);
  }

  setPriority(bindingName: string, priority: number): void {
--- a/srcts/src/shiny/init.ts
+++ b/srcts/src/shiny/init.ts
@@ -21,7 +21,7 @@ import {
 import { bindAll, unbindAll, _bindAll } from "./bind";
 import type { BindInputsCtx, BindScope } from "./bind";
 import { setShinyObj } from "./initedMethods";
-import { registerDependency } from "./render";
+import { registerDependency, renderHtml } from "./render";
 import { sendImageSizeFns } from "./sendImageSize";
 import { ShinyApp } from "./shinyapp";
 import { registerNames as singletonsRegisterNames } from "./singletons";
@@ -150,6 +150,19 @@ function initShiny(windowShiny: Shiny): void {
    (x) => x.value
  );

+  // When future bindings are registered via dynamic UI, check to see if renderHtml()
+  // is currently executing. If it's not, it's likely that the binding registration
+  // is occurring a tick after renderHtml()/renderContent(), in which case we need
+  // to make sure the new bindings get a chance to bind to the DOM. (#3635)
+  const maybeBindOnRegister = debounce(0, () => {
+    if (!renderHtml.isExecuting()) {
+      windowShiny.bindAll(document.documentElement);
+    }
+  });
+
+  inputBindings.onRegister(maybeBindOnRegister, false);
+  outputBindings.onRegister(maybeBindOnRegister, false);
+
  // The server needs to know the size of each image and plot output element,
  // in case it is auto-sizing
  $(".shiny-image-output, .shiny-plot-output, .shiny-report-size").each(
--- a/srcts/src/shiny/render.ts
+++ b/srcts/src/shiny/render.ts
@@ -72,10 +72,20 @@ function renderHtml(
  dependencies: HtmlDep[],
  where: WherePosition = "replace"
 ): ReturnType<typeof singletonsRenderHtml> {
-  renderDependencies(dependencies);
-  return singletonsRenderHtml(html, el, where);
+  renderHtml._renderCount++;
+  try {
+    renderDependencies(dependencies);
+    return singletonsRenderHtml(html, el, where);
+  } finally {
+    renderHtml._renderCount--;
+  }
 }

+renderHtml._renderCount = 0;
+renderHtml.isExecuting = function () {
+  return renderHtml._renderCount > 0;
+};
+
 type HtmlDepVersion = string;

 type MetaItem = {
@@ -199,6 +209,9 @@ function renderDependency(dep_: HtmlDep) {
    $head.append(stylesheetLinks);
  }

+  const scriptPromises: Array<Promise<any>> = [];
+  const scriptElements: HTMLScriptElement[] = [];
+
  dep.script.forEach((x) => {
    const script = document.createElement("script");

@@ -210,9 +223,23 @@ function renderDependency(dep_: HtmlDep) {
      script.setAttribute(attr, val ? val : "");
    });

-    $head.append(script);
+    const p = new Promise((resolve) => {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      script.onload = (e: Event) => {
+        resolve(null);
+      };
+    });
+
+    scriptPromises.push(p);
+    scriptElements.push(script);
  });

+  // Append the script elements all at once, so that we're sure they'll load in
+  // order. (We didn't append them individually in the `forEach()` above,
+  // because we're not sure that the browser will load them in order if done
+  // that way.)
+  document.head.append(...scriptElements);
+
  dep.attachment.forEach((x) => {
    const link = $("<link rel='attachment'>")
      .attr("id", dep.name + "-" + x.key + "-attachment")
@@ -221,12 +248,22 @@ function renderDependency(dep_: HtmlDep) {
    $head.append(link);
  });

-  if (dep.head) {
-    const $newHead = $("<head></head>");
+  Promise.allSettled(scriptPromises).then(() => {
+    // After the scripts are all loaded, insert any head content. This may
+    // contain <script> tags with inline content, which we want to execute after
+    // the script elements above, because the code here may depend on them.
+    if (dep.head) {
+      const $newHead = $("<head></head>");
+
+      $newHead.html(dep.head);
+      $head.append($newHead.children());
+    }
+
+    // Bind all
+    shinyInitializeInputs(document.body);
+    shinyBindAll(document.body);
+  });

-    $newHead.html(dep.head);
-    $head.append($newHead.children());
-  }
  return true;
 }

--- a/srcts/src/shiny/singletons.ts
+++ b/srcts/src/shiny/singletons.ts
@@ -1,5 +1,4 @@
 import $ from "jquery";
-import { toLowerCase } from "../utils";
 import type { BindScope } from "./bind";

 const reSingleton = /<!--(SHINY.SINGLETON\[([\w]+)\])-->([\s\S]*?)<!--\/\1-->/;
@@ -23,21 +22,30 @@ function renderHtml(

  addToHead(processed.head);
  register(processed.singletons);
-  if (where === "replace") {
-    $(el).html(processed.html);
-  } else {
-    let elElements: HTMLElement[];

-    if (el instanceof HTMLElement) {
-      elElements = [el];
-    } else {
-      elElements = el.toArray();
-    }
-    $.each(elElements, (i, el) => {
-      // type InsertPosition = "beforebegin" | "afterbegin" | "beforeend" | "afterend"
-      el.insertAdjacentHTML(toLowerCase(where), processed.html);
-    });
+  // N.B. even though the DOM insertion below _could_ be done with vanilla JS,
+  // we intentionally use jQuery so that <script> tags execute.
+  // https://github.com/rstudio/shiny/pull/3630
+  switch (where.toLowerCase()) {
+    case "replace":
+      $(el).html(processed.html);
+      break;
+    case "beforebegin":
+      $(el).before(processed.html);
+      break;
+    case "afterbegin":
+      $(el).prepend(processed.html);
+      break;
+    case "beforeend":
+      $(el).append(processed.html);
+      break;
+    case "afterend":
+      $(el).after(processed.html);
+      break;
+    default:
+      throw new Error("Unknown where position: " + where);
  }
+
  return processed;
 }
 // Take an object where keys are names of singletons, and merges it into
--- a/srcts/src/time/throttle.ts
+++ b/srcts/src/time/throttle.ts
@@ -19,40 +19,67 @@ class Throttler<X extends AnyVoidFunction> implements InputRatePolicy<X> {
    this.args = null;
  }

+  // If no timer is currently running, immediately call the function and set the
+  // timer; if a timer is running out, just queue up the args for the call when
+  // the timer runs out. Later calls during the same timeout will overwrite
+  // earlier ones.
  normalCall(...args: Parameters<X>): void {
+    // This will be an empty array (not null) if called without arguments, and
+    // `[null]` if called with `null`.
    this.args = args;
+
+    // Only invoke immediately if there isn't a timer running.
    if (this.timerId === null) {
      this.$invoke();
-      this.timerId = setTimeout(() => {
-        // IE8 doesn't reliably clear timeout, so this additional
-        // check is needed
-        if (this.timerId === null) return;
-        this.$clearTimer();
-        if (args.length > 0) this.normalCall(...args);
-      }, this.delayMs);
    }
  }
+
+  // Reset the timer if active and call immediately
  immediateCall(...args: Parameters<X>): void {
    this.$clearTimer();
    this.args = args;
    this.$invoke();
  }
+
+  // Is there a call waiting to send?
  isPending(): boolean {
-    return this.timerId !== null;
+    return this.args !== null;
  }
+
  $clearTimer(): void {
    if (this.timerId !== null) {
      clearTimeout(this.timerId);
      this.timerId = null;
    }
  }
+
+  // Invoke the throttled function with the currently-stored args and start the
+  // timer.
  $invoke(): void {
-    if (this.args && this.args.length > 0) {
-      this.func.apply(this.target, this.args);
-    } else {
-      this.func.apply(this.target);
+    if (this.args === null) {
+      // Shouldn't get here, because $invoke should only be called right after
+      // setting this.args. But just in case.
+      return;
    }
+
+    this.func.apply(this.target, this.args);
+
+    // Clear the stored args. This is used to track if a call is pending.
    this.args = null;
+
+    // Set this.timerId to a newly-created timer, which will invoke a call with
+    // the most recently called args (if any) when it expires.
+    this.timerId = setTimeout(() => {
+      // IE8 doesn't reliably clear timeout, so this additional check is needed
+      if (this.timerId === null) return;
+
+      this.$clearTimer();
+      // Do we have a call queued up?
+      if (this.isPending()) {
+        // If so, invoke the call with queued args and reset timer.
+        this.$invoke();
+      }
+    }, this.delayMs);
  }
 }

--- a/srcts/src/utils/callbacks.ts
+++ b/srcts/src/utils/callbacks.ts
@@ -0,0 +1,45 @@
+type Cb = {
+  once: boolean;
+  fn: () => void;
+};
+
+type Cbs = {
+  [key: string]: Cb;
+};
+
+class Callbacks {
+  callbacks: Cbs = {};
+  id = 0;
+
+  register(fn: () => void, once = true): () => void {
+    this.id += 1;
+    const id = this.id;
+
+    this.callbacks[id] = { fn, once };
+    return () => {
+      delete this.callbacks[id];
+    };
+  }
+
+  invoke(): void {
+    for (const id in this.callbacks) {
+      const cb = this.callbacks[id];
+
+      try {
+        cb.fn();
+      } finally {
+        if (cb.once) delete this.callbacks[id];
+      }
+    }
+  }
+
+  clear(): void {
+    this.callbacks = {};
+  }
+
+  count(): number {
+    return Object.keys(this.callbacks).length;
+  }
+}
+
+export { Callbacks };
--- a/srcts/types/src/bindings/registry.d.ts
+++ b/srcts/types/src/bindings/registry.d.ts
@@ -1,3 +1,4 @@
+import { Callbacks } from "../utils/callbacks";
 interface BindingBase {
    name: string;
 }
@@ -12,7 +13,9 @@ declare class BindingRegistry<Binding extends BindingBase> {
    bindingNames: {
        [key: string]: BindingObj<Binding>;
    };
+    registerCallbacks: Callbacks;
    register(binding: Binding, bindingName: string, priority?: number): void;
+    onRegister(fn: () => void, once?: boolean): void;
    setPriority(bindingName: string, priority: number): void;
    getPriority(bindingName: string): number | false;
    getBindings(): Array<BindingObj<Binding>>;
--- a/srcts/types/src/shiny/render.d.ts
+++ b/srcts/types/src/shiny/render.d.ts
@@ -7,6 +7,10 @@ declare function renderContent(el: BindScope, content: string | {
    deps?: HtmlDep[];
 } | null, where?: WherePosition): void;
 declare function renderHtml(html: string, el: BindScope, dependencies: HtmlDep[], where?: WherePosition): ReturnType<typeof singletonsRenderHtml>;
+declare namespace renderHtml {
+    var _renderCount: number;
+    var isExecuting: () => boolean;
+}
 declare type HtmlDepVersion = string;
 declare type MetaItem = {
    name: string;
--- a/srcts/types/src/utils/callbacks.d.ts
+++ b/srcts/types/src/utils/callbacks.d.ts
@@ -0,0 +1,16 @@
+declare type Cb = {
+    once: boolean;
+    fn: () => void;
+};
+declare type Cbs = {
+    [key: string]: Cb;
+};
+declare class Callbacks {
+    callbacks: Cbs;
+    id: number;
+    register(fn: () => void, once?: boolean): () => void;
+    invoke(): void;
+    clear(): void;
+    count(): number;
+}
+export { Callbacks };
--- a/tests/testthat/_snaps/test-shinyAppTemplate.md
+++ b/tests/testthat/_snaps/test-shinyAppTemplate.md
@@ -0,0 +1,54 @@
+# app template works with runTests: all
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-all/tests/testthat.R
+
+# app template works with runTests: app_tests
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-app_tests/tests/testthat.R
+
+# app template works with runTests: app_module_tests
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-app_module_tests/tests/testthat.R
+
+# app template works with runTests: app_rdir_tests
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-app_rdir_tests/tests/testthat.R
+
+# app template works with runTests: app_module_rdir_tests
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-app_module_rdir_tests/tests/testthat.R
+
+# app template works with runTests: app_shinytest_testthat
+
+    Code
+      out
+    Output
+      Shiny App Test Results
+      * Success
+        - shinyAppTemplate-app_shinytest_testthat/tests/testthat.R
+
--- a/tests/testthat/_snaps/test.md
+++ b/tests/testthat/_snaps/test.md
@@ -1,64 +0,0 @@
-# app template works with runTests
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-all/tests/shinytest.R
-        - shinyAppTemplate-all/tests/testthat.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_shinytest/tests/shinytest.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_module_shinytest/tests/shinytest.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_testthat/tests/testthat.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_module_testthat/tests/testthat.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_rdir_testthat/tests/testthat.R
-
---
-
-    Code
-      out
-    Output
-      Shiny App Test Results
-      * Success
-        - shinyAppTemplate-app_module_rdir_testthat/tests/testthat.R
-
--- a/tests/testthat/test-bookmarking.R
+++ b/tests/testthat/test-bookmarking.R
@@ -1,23 +1,33 @@
 test_that("Inputs and values in query string", {
-  # Normal format
-  vals <- RestoreContext$new("?_inputs_&a=1&b=2&_values_&x=3")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list(x=3L))

-  # No leading '?', trailing '&', and values before inputs
-  vals <- RestoreContext$new("_values_&x=3&_inputs_&a=1&b=2&")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list(x=3L))
+  restore_context <- function(...) {
+    RestoreContext$new(paste0(...))$asList()
+  }

-  # Just inputs, no values, and leading '&'
-  vals <- RestoreContext$new("&_inputs_&a=1&b=2")$asList()
-  expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
-  expect_identical(as.list(vals$values), list())
+  for (input_str in c("_inputs_", "_inputs_=")) {
+    for (value_str in c("_values_", "_values_=")) {

-  # No inputs, just values
-  vals <- RestoreContext$new("?_values_&x=3")$asList()
-  expect_identical(vals$input, list())
-  expect_identical(as.list(vals$values), list(x=3L))
+      # Normal format
+      vals <- restore_context("?", input_str, "&a=1&b=2&", value_str, "&x=3")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list(x=3L))
+
+      # No leading '?', trailing '&', and values before inputs
+      vals <- restore_context(value_str, "&x=3&", input_str, "&a=1&b=2&")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list(x=3L))
+
+      # Just inputs, no values, and leading '&'
+      vals <- restore_context("&", input_str, "&a=1&b=2")
+      expect_true(contents_identical(vals$input, list(a=1L, b=2L)))
+      expect_identical(as.list(vals$values), list())
+
+      # No inputs, just values
+      vals <- restore_context("?", value_str, "&x=3")
+      expect_identical(vals$input, list())
+      expect_identical(as.list(vals$values), list(x=3L))
+    }
+  }

  # Empty query string
  vals <- RestoreContext$new("")$asList()
@@ -35,12 +45,12 @@ test_that("Inputs and values in query string", {
  suppress_stacktrace(expect_warning(expect_warning(RestoreContext$new("?_inputs_&a=1&_inputs_&b=2"))))
  suppress_stacktrace(expect_warning(expect_warning(RestoreContext$new("?_inputs_&a=1&_values_&b=2&_inputs_&"))))
  suppress_stacktrace(expect_warning(expect_warning(RestoreContext$new("?_values_&a=1&_values_"))))
-  suppress_stacktrace(expect_warning(expect_warning(RestoreContext$new("?_inputs_&a=1&_values_&_values&b=2"))))
+  suppress_stacktrace(expect_warning(RestoreContext$new("?_inputs_&a=1&_values_&_values&b=2")))

  # If there's an error in the conversion from query string, should have
  # blank values.
-  suppress_stacktrace(expect_warning(expect_warning(rc <- RestoreContext$new("?_inputs_&a=[x&b=1"))))
-  expect_identical(rc$input$asList(), list())
+  suppress_stacktrace(expect_warning(rc <- RestoreContext$new("?_inputs_&a=[x&b=1")))
+  expect_identical(rc$input$asList(), list(b=1L))
  expect_identical(as.list(rc$values), list())
  expect_identical(rc$dir, NULL)

--- a/tests/testthat/test-reactives.R
+++ b/tests/testthat/test-reactives.R
@@ -13,3 +13,28 @@ test_that("can access reactive values directly", {
  y <- reactive(x1() + x2$a)
  expect_equal(y(), 4)
 })
+
+test_that("errors in throttled/debounced reactives are catchable", {
+  reactiveConsole(TRUE)
+  on.exit(reactiveConsole(FALSE))
+
+  # In Shiny 1.7 and earlier, if a throttled/debounced reactive threw an error,
+  # it would cause internal observers used by the implementations of
+  # debounce/throttle to error, which would kill the session. The correct
+  # behavior is to only expose the error to consumers of the throttled/debounced
+  # reactive.
+
+  r <- reactive({
+    stop("boom")
+  })
+
+  rd <- r %>% debounce(1000)
+  rt <- r %>% throttle(1000)
+
+  observe({
+    try(rd(), silent = TRUE)
+    try(rt(), silent = TRUE)
+  })
+
+  expect_silent(flushReact())
+})
--- a/tests/testthat/test-stacks-pruning.R
+++ b/tests/testthat/test-stacks-pruning.R
@@ -1,30 +1,33 @@
-capture <- function() {
-  list(
-    calls = sys.calls(),
-    parents = sys.parents()
+foo <- function() {
+  capture <- function() {
+    list(
+      calls = sys.calls(),
+      parents = sys.parents()
+    )
+  }
+
+  capture_1 <- function() {
+    capture()
+  }
+
+  capture_2 <- function() {
+    capture_1()
+  }
+
+  do.call(
+    identity,
+    list(
+      identity(capture_2())
+    )
  )
 }
-
-capture_1 <- function() {
-  capture()
-}
-
-capture_2 <- function() {
-  capture_1()
-}
-
-res <- do.call(
-  identity,
-  list(
-    identity(capture_2())
-  )
-)
-res$calls <- tail(res$calls, 5)
-res$parents <- tail(res$parents - (length(res$parents) - 5), 5)
+res <- foo()
+res$calls <- tail(res$calls, 6)
+res$parents <- tail(res$parents - (length(res$parents) - 6), 6)

 describe("stack pruning", {
  it("passes basic example", {
-    expect_equal(pruneStackTrace(res$parents), c(F, F, T, T, T))
-    expect_equal(lapply(list(res$parents), pruneStackTrace), list(c(F, F, T, T, T)))
+    expect_equal(pruneStackTrace(res$parents), c(T, F, F, T, T, T))
+    expect_equal(lapply(list(res$parents), pruneStackTrace), list(c(T, F, F, T, T, T)))
  })
 })
--- a/tests/testthat/test-test-runTests.R
+++ b/tests/testthat/test-test-runTests.R
@@ -133,46 +133,3 @@ test_that("runTests runs as expected without rewiring", {
  ), ignore_attr = TRUE)
  expect_s3_class(df, "shiny_runtests")
 })
-
-test_that("app template works with runTests", {
-
-  # testthat::skip_on_cran()
-  suppressWarnings(testthat::skip_if_not_installed("shinytest", "1.3.1.9000"))
-  testthat::skip_if(!shinytest::dependenciesInstalled(), "shinytest dependencies not installed. Call `shinytest::installDependencies()`")
-
-  # test all combos
-  make_combos <- function(...) {
-    args <- list(...)
-    combo_dt <- do.call(expand.grid, args)
-    lapply(apply(combo_dt, 1, unlist), unname)
-  }
-
-  combos <- unique(unlist(
-    recursive = FALSE,
-    list(
-      "all",
-      # only test cases for shinytest where appropriate, shinytest is "slow"
-      make_combos("app", list(NULL, "module"), "shinytest"),
-      # expand.grid on all combos
-      make_combos("app", list(NULL, "module"), list(NULL, "rdir"), list(NULL, "testthat"))
-    )
-  ))
-
-  for (combo in combos) {
-    random_folder <- paste0("shinyAppTemplate-", paste0(combo, collapse = "_"))
-    tempTemplateDir <- file.path(tempfile(), random_folder)
-    suppressMessages(shinyAppTemplate(tempTemplateDir, combo))
-    on.exit(unlink(tempTemplateDir, recursive = TRUE), add = TRUE)
-
-    if (any(c("all", "shinytest", "testthat") %in% combo)) {
-      suppressMessages(capture.output({
-        out <- runTests(tempTemplateDir, assert = FALSE)
-      }))
-      expect_snapshot(out)
-    } else {
-      expect_error(
-        suppressMessages(runTests(tempTemplateDir))
-      )
-    }
-  }
-})
--- a/tests/testthat/test-test-shinyAppTemplate.R
+++ b/tests/testthat/test-test-shinyAppTemplate.R
@@ -0,0 +1,41 @@
+# testthat::skip_on_cran()
+suppressWarnings(testthat::skip_if_not_installed("shinytest2"))
+
+# test all combos
+make_combos <- function(...) {
+  args <- list(...)
+  combo_dt <- do.call(expand.grid, args)
+  lapply(apply(combo_dt, 1, unlist), unname)
+}
+
+combos <- unique(unlist(
+  recursive = FALSE,
+  list(
+    "all",
+    # expand.grid on all combos
+    make_combos("app", list(NULL, "module"), list(NULL, "rdir"), list(NULL, "tests")),
+    # Legacy values
+    list(list("app", "shinytest", "testthat"))
+  )
+))
+
+for (combo in combos) {
+  combo_name <- paste0(combo, collapse = "_")
+  test_that(paste0("app template works with runTests: ", combo_name), {
+    random_folder <- paste0("shinyAppTemplate-", combo_name)
+    tempTemplateDir <- file.path(tempfile(), random_folder)
+    suppressMessages(shinyAppTemplate(tempTemplateDir, combo))
+    on.exit(unlink(tempTemplateDir, recursive = TRUE), add = TRUE)
+
+    if (any(c("all", "tests", "shinytest", "testthat") %in% combo)) {
+      suppressMessages(capture.output({
+        out <- runTests(tempTemplateDir, assert = FALSE)
+      }))
+      expect_snapshot(out)
+    } else {
+      expect_error(
+        suppressMessages(runTests(tempTemplateDir))
+      )
+    }
+  })
+}
--- a/tools/documentation/updateReexports.R
+++ b/tools/documentation/updateReexports.R
@@ -1,8 +1,8 @@
 # source("tools/documentation/updateReexports.R")
-# Will add all functions aliased in `./tools/documentation/reexports.yml`
+# Will add all functions aliased in `./tools/documentation/reexports.json`
 # Will save all reexports to `./R/reexports.R` and document to enforce all re-exports
-# This script needs information from `./tools/documentation/reexports.yml` to allow pkgdown to be on the same page
-# Information from `./tools/documentation/reexports.yml` will be used in `shiny-dev-center`
+# This script needs information from `./tools/documentation/reexports.json` to allow pkgdown to be on the same page
+# Information from `./tools/documentation/reexports.json` will be used in `shiny-dev-center`


 local({
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,13 @@
 {
  "declaration": true,
  "compilerOptions": {
-    "target": "ES5",
+    "target": "es2020",
    "isolatedModules": true,
    "esModuleInterop": true,
    "declaration": true,
    "declarationDir": "./srcts/types",
    "emitDeclarationOnly": true,
+    "moduleResolution": "node",
    // Can not use `types: []` to disable injecting NodeJS types. More types are
    // needed than just the DOM's `window.setTimeout`
    // "types": [],
Author	SHA1	Message	Date
Winston Chang	2e934797c9	Insert <head> content after script tags	2022-07-07 22:01:01 -05:00
wch	581ace76e4	`yarn build` (GitHub Actions)	2022-07-07 20:01:30 +00:00
Winston Chang	e43609b60a	Load script tags the normal way instead of with jQuery's synchronouse XHR	2022-07-07 14:54:29 -05:00
Carson	d0bf86e5e2	Add a clear() method to Callbacks	2022-07-07 13:37:37 -05:00
Carson	b023350b90	Introduce an onRegister() method on BindingRegistry to help solve the problem with sharing state	2022-07-07 13:36:21 -05:00
Carson	7bccfeb774	Close #3635 : attempt another bind when registering a binding outside a renderHtml() context	2022-07-07 13:35:07 -05:00
Winston Chang	54e5a6b43c	Merge branch 'dvg-p4-fix-throttle'	2022-07-05 20:03:22 -05:00
Winston Chang	9653cc2893	Rebuild shiny.js	2022-07-05 20:01:22 -05:00
Winston Chang	47dc5b4116	Code and comment cleanup	2022-07-05 19:37:44 -05:00
dvg-p4	9db9ef527a	Fixed check for isPending and rebuilt javascript	2022-07-04 10:21:22 -04:00
dvg-p4	9285a1f7fc	Update srcts/src/time/throttle.ts Based on suggestion Co-authored-by: Winston Chang <winston@stdout.org>	2022-07-01 19:02:26 -04:00
dvg-p4	d22eb1524a	Updated NEWS.md	2022-07-01 17:15:09 -04:00
dvg-p4	5e3971c776	Fixed major bug in throttle.ts	2022-07-01 16:58:41 -04:00
Joe Cheng	ff5ef52dd5	Fix #3250 (#3602 ) * Fix #3250 pruneStackTrace was interacting badly with dplyr errors. I'm still not sure what causes these new cases, but the new behavior seems to be much better, with no downside that I can think of. * Fix existing unit tests * Update news Co-authored-by: Carson Sievert <cpsievert1@gmail.com>	2022-06-27 12:05:28 -05:00
Joe Cheng	634b1c7c3c	Don't kill the session when a debounced/throttled reactive expr errors (#3624 ) * Don't kill the session when a debounced/throttled reactive expr errors Fixes #3581 * Update NEWS with PR number Co-authored-by: Carson Sievert <cpsievert1@gmail.com>	2022-06-27 10:57:10 -05:00
Carson Sievert	d4527cdc28	Use `ragg::agg_png` over `Cairo::CairoPNG` if available (#3654 ) * Close #3626: use ragg::agg_png over Cairo::CairoPNG if available * Update documentation	2022-06-24 17:50:58 -05:00
Carson Sievert	474f14003b	Follow up to #3385 : warn instead of message; update unit tests to reflect some parameters can now succeed when others fail (#3652 )	2022-06-14 10:34:20 -05:00
Carson Sievert	8a5da25545	Fix/update news (#3651 )	2022-06-14 09:18:51 -05:00
Barret Schloerke	540d68ed9f	Update the `_inputs_` and `_values_` regular expr to support a trailing `=` (#3648 )	2022-06-10 11:39:12 -04:00
Khaled Al-Shamaa	1ad49b153c	Enable `fileInput` to set the `capture` attribute (#3481 ) Co-authored-by: Barret Schloerke <barret@rstudio.com> Co-authored-by: Barret Schloerke <schloerke@gmail.com> Co-authored-by: Winston Chang <winston@stdout.org>	2022-06-10 10:30:34 -05:00
Winston Chang	15885cbb5f	Update NEWS	2022-06-10 10:07:00 -05:00
Dean Attali	b6979d135c	fix bookmarking bug #2297 : don't break all bookmarking system if some URL params don't parse correctly (#3385 ) Co-authored-by: Barret Schloerke <barret@rstudio.com>	2022-06-10 10:04:47 -05:00
Winston Chang	d4b19820a4	Update NEWS	2022-06-10 10:02:30 -05:00
Dieter Menne	8d529095a7	Corrected for stricter length checking in R 4.2.0 (#3625 ) * Corrected for stricter length checking in R 4.2.0 * Update R/bootstrap-layout.R Fine! I had thought of that case, but could not find that elegant solution Co-authored-by: Carson Sievert <cpsievert1@gmail.com> Co-authored-by: Carson Sievert <cpsievert1@gmail.com>	2022-06-10 09:59:14 -05:00
Winston Chang	77f9052ab5	Make mathjax configurable (#3650 ) Co-authored-by: Neutron3529 <qweytr_1@163.com> Co-authored-by: Joe Cheng <joe@rstudio.com>	2022-06-10 09:57:02 -05:00
Ryan Barnard	9fcc1fe8ad	Fixed automatic guessing of Content-Type in downloadHandler (#3393 ) * Set default downloadHandler contentType to NULL. The change from %OR% to %\|\|% broke automatic guessing of content type since `NA %\|\|% ...` evaluates to `NA`. Setting the default contentType to NULL restores the previous behavior of automatically setting the content type based on the file extension. * Updated NEWS.md: downloadHandler contentType fix. * Update NEWS.md Co-authored-by: Winston Chang <winston@stdout.org> Co-authored-by: Barret Schloerke <barret@rstudio.com>	2022-06-10 09:39:00 -05:00
Barret Schloerke	5d30b55372	Spelling `defintion` -> `definition` (#3649 )	2022-06-09 16:52:27 -04:00
Carson Sievert	78d77ce373	insertUI() now supports execution of <script> (#3630 )	2022-05-10 11:43:21 -05:00
Joe Cheng	2cae04186b	Merge pull request #3628 from rstudio/joe/feature/autoreload-custom-url Add ability for autoreload ws to be at a custom URL	2022-05-04 16:35:39 -07:00
Joe Cheng	59bddea1e9	Use external, not internal, sourcemaps for extras	2022-05-04 16:23:48 -07:00
Joe Cheng	d6bd3d9f9b	Add ability for autoreload ws to be at a custom URL	2022-05-04 09:05:53 -07:00
Joe Cheng	8eb7b056f2	devmode should activate autoreload (#3620 ) devmode should activate autoreload It said it didn't, but until this commit, it appeared not to	2022-04-27 13:51:02 -07:00
Barret Schloerke	40ae9a903e	Spelling (#3618 )	2022-04-23 12:25:11 -04:00
Barret Schloerke	5b6c80d4b2	Update `shinyAppTemplate()` content to use `{shinytest2}` (#3599 )	2022-04-22 16:10:11 -04:00
Dean Attali	fd7518018c	Update internal docs: `reexports.yml` -> `reexports.json` (#3522 )	2022-03-11 11:59:35 -05:00