soft-deprecate bootstrapPage() and basicPage(). Fixes #2594

2026-01-11 16:08:19 -05:00 · 2019-09-10 17:48:13 -05:00
74 changed files with 620 additions and 12253 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,6 @@ matrix:
      r: release
    - name: "Development Release Check"
      r: devel
-
 sudo: false
 cache: packages
 notifications:
--- a/16
+++ b/16
@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.4.0.1
+Version: 1.3.2.9001
 Authors@R: c(
    person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com"),
    person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -65,16 +65,16 @@ Depends:
 Imports:
    utils,
    grDevices,
-    httpuv (>= 1.5.2),
+    httpuv (>= 1.5.1.9002),
    mime (>= 0.3),
    jsonlite (>= 0.9.16),
    xtable,
    digest,
-    htmltools (>= 0.4.0),
+    htmltools (>= 0.3.6.9004),
    R6 (>= 2.0),
    sourcetools,
-    later (>= 1.0.0),
-    promises (>= 1.1.0),
+    later (>= 0.7.2),
+    promises (>= 1.0.1),
    tools,
    crayon,
    rlang (>= 0.4.0),
@@ -88,8 +88,10 @@ Suggests:
    rmarkdown,
    ggplot2,
    reactlog (>= 1.0.0),
-    magrittr,
-    yaml
+    magrittr
+Remotes:
+    rstudio/htmltools,
+    rstudio/httpuv
 URL: http://shiny.rstudio.com
 BugReports: https://github.com/rstudio/shiny/issues
 Collate:
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,51 +1,41 @@
-shiny 1.4.0.1
-===========
+shiny 1.3.2.9001
+=======

-Minor patch release to account for changes to the grid package that will be upcoming in the R 4.0 release ([#2776](https://github.com/rstudio/shiny/pull/2776)).
-
-shiny 1.4.0
-===========
-
-## Full changelog
-
-### Breaking changes
-
-* Resolved [#2554](https://github.com/rstudio/shiny/issues/2554): Upgraded jQuery from v.1.12.4 to v3.4.1 and bootstrap from v3.3.7 to v3.4.1. ([#2557](https://github.com/rstudio/shiny/pull/2557)). Since the jQuery upgrade may introduce breaking changes to user code, there is an option to switch back to the old version by setting `options(shiny.jquery.version = 1)`. If you've hard-coded `shared/jquery[.min].js` in the HTML of your Shiny app, in order to downgrade, you'll have to change that filepath to `shared/legacy/jquery[.min].js`.
-
-### Improvements
+## Changes

 * Resolved [#1433](https://github.com/rstudio/shiny/issues/1433): `plotOutput()`'s coordmap info now includes discrete axis limits for **ggplot2** plots. As a result, any **shinytest** tests that contain **ggplot2** plots with discrete axes (that were recorded before this change) will now report differences that can safely be updated. This new coordmap info was added to correctly infer what data points are within an input brush and/or near input click/hover in scenarios where a non-trivial discrete axis scale is involved (e.g., whenever `scale_[x/y]_discrete(limits = ...)` and/or free scales across multiple discrete axes are used). ([#2410](https://github.com/rstudio/shiny/pull/2410))

+### Improvements
+
 * Resolved [#2402](https://github.com/rstudio/shiny/issues/2402): An informative warning is now thrown for mis-specified (date) strings in `dateInput()`, `updateDateInput()`, `dateRangeInput()`, and `updateDateRangeInput()`. ([#2403](https://github.com/rstudio/shiny/pull/2403))

 * If the `shiny.autoload.r` option is set to `TRUE`, all files ending in `.r` or `.R` contained in a directory named `R/` adjacent to your application are sourced when your app is started. This will become the default Shiny behavior in a future release ([#2547](https://github.com/rstudio/shiny/pull/2547))

+
 * Resolved [#2442](https://github.com/rstudio/shiny/issues/2442): The `shiny:inputchanged` JavaScript event now triggers on the related input element instead of `document`. Existing event listeners bound to `document` will still detect the event due to event bubbling. ([#2446](https://github.com/rstudio/shiny/pull/2446))

 * Fixed [#1393](https://github.com/rstudio/shiny/issues/1393), [#2223](https://github.com/rstudio/shiny/issues/2223): For plots with any interactions enabled, the image is no longer draggable. ([#2460](https://github.com/rstudio/shiny/pull/2460))

-* Resolved [#2469](https://github.com/rstudio/shiny/issues/2469): `renderText` now takes a `sep` argument that is passed to `cat`. ([#2497](https://github.com/rstudio/shiny/pull/2497))
-
-* Added `resourcePaths()` and `removeResourcePaths()` functions. ([#2459](https://github.com/rstudio/shiny/pull/2459))
-
-* Resolved [#2433](https://github.com/rstudio/shiny/issues/2433): An informative warning is now thrown if subdirectories of the app's `www/` directory are masked by other resource prefixes and/or the same resource prefix is mapped to different local file paths. ([#2434](https://github.com/rstudio/shiny/pull/2434))
-
-* Resolved [#2478](https://github.com/rstudio/shiny/issues/2478): `cmd + shift + f3` and `ctrl + shift + f3` can now be used to add a reactlog mark. If reactlog keybindings are used and the reactlog is not enabled, an error page is displayed showing how to enable reactlog recordings. ([#2560](https://github.com/rstudio/shiny/pull/2560))
-
-### Bug fixes
-
 * Partially resolved [#2423](https://github.com/rstudio/shiny/issues/2423): Reactivity in Shiny leaked some memory, because R can leak memory whenever a new symbols is interned, which happens whenever a new name/key is used in an environment. R now uses the fastmap package, which avoids this problem. ([#2429](https://github.com/rstudio/shiny/pull/2429))

 * Fixed [#2267](https://github.com/rstudio/shiny/issues/2267): Fixed a memory leak with `invalidateLater`. ([#2555](https://github.com/rstudio/shiny/pull/2555))

 * Fixed [#1548](https://github.com/rstudio/shiny/issues/1548): The `reactivePoll` function leaked an observer; that is the observer would continue to exist even if the `reactivePoll` object was no longer accessible. [#2522](https://github.com/rstudio/shiny/pull/2522)

-* Fixed [#2116](https://github.com/rstudio/shiny/issues/2116): Fixed an issue where dynamic tabs could not be added when on a hosted platform. ([#2545](https://github.com/rstudio/shiny/pull/2545))
+* Resolved [#2469](https://github.com/rstudio/shiny/issues/2469): `renderText` now takes a `sep` argument that is passed to `cat`. ([#2497](https://github.com/rstudio/shiny/pull/2497))

-* Resolved [#2515](https://github.com/rstudio/shiny/issues/2515): `selectInput()` and `selectizeInput()` now deal appropriately with named factors. Note that `updateSelectInput()` and `updateSelectizeInput()` **do not** yet handle factors; their behavior is unchanged. ([#2524](https://github.com/rstudio/shiny/pull/2524), [#2540](https://github.com/rstudio/shiny/pull/2540), [#2625](https://github.com/rstudio/shiny/pull/2625))
+* Added `resourcePaths()` and `removeResourcePaths()` functions. ([#2459](https://github.com/rstudio/shiny/pull/2459))
+
+* Resolved [#2515](https://github.com/rstudio/shiny/issues/2515): `selectInput()` now deals appropriately with named factors. ([#2524](https://github.com/rstudio/shiny/pull/2524))
+
+* Resolved [#2433](https://github.com/rstudio/shiny/issues/2433): An informative warning is now thrown if subdirectories of the app's `www/` directory are masked by other resource prefixes and/or the same resource prefix is mapped to different local file paths. ([#2434](https://github.com/rstudio/shiny/pull/2434))

 * Resolved [#2471](https://github.com/rstudio/shiny/issues/2471): Large file uploads to a Windows computer were slow. ([#2579](https://github.com/rstudio/shiny/pull/2579))

+### Bug fixes
+
+* Fixed [#2116](https://github.com/rstudio/shiny/issues/2116): Fixed an issue where dynamic tabs could not be added when on a hosted platform. ([#2545](https://github.com/rstudio/shiny/pull/2545))
+
 * Fixed [#2387](https://github.com/rstudio/shiny/issues/2387): Updating a `sliderInput()`'s type from numeric to date no longer changes the rate policy from debounced to immediate. More generally, updating an input binding with a new type should (no longer) incorrectly alter the input rate policy. ([#2404](https://github.com/rstudio/shiny/pull/2404))

 * Fixed [#868](https://github.com/rstudio/shiny/issues/868): If an input is initialized with a `NULL` label, it can now be updated with a string. Moreover, if an input label is initialized with a string, it can now be removed by updating with `label=character(0)` (similar to how `choices` and `selected` can be cleared in `updateSelectInput()`). ([#2406](https://github.com/rstudio/shiny/pull/2406))
@@ -62,10 +52,12 @@ shiny 1.4.0

 * Fixed [rstudio/reactlog#36](https://github.com/rstudio/reactlog/issues/36): Changes to reactive values not displaying accurately in reactlog. ([#2424](https://github.com/rstudio/shiny/pull/2424))

-* Fixed [#2598](https://github.com/rstudio/shiny/issues/2598): Showcase files don't appear with a wide window. ([#2582](https://github.com/rstudio/shiny/pull/2582))
-
 * Fixed [#2329](https://github.com/rstudio/shiny/issues/2329), [#1817](https://github.com/rstudio/shiny/issues/1817): These bugs were reported as fixed in Shiny 1.3.0 but were not actually fixed because some JavaScript changes were accidentally not included in the release. The fix resolves issues that occur when `withProgressBar()` or bookmarking are combined with the [networkD3](https://christophergandrud.github.io/networkD3/) package's Sankey plot.

+### Library updates
+
+* Resolved [#2554](https://github.com/rstudio/shiny/issues/2554): Upgraded bootstrap to v3.4.1 and jQuery to v3.4.1. ([#2557](https://github.com/rstudio/shiny/pull/2557))
+

 shiny 1.3.2
 ===========
@@ -636,7 +628,7 @@ There are many more minor features, small improvements, and bug fixes than we ca

 *    **Code Diagnostics**: if there is an error parsing `ui.R`, `server.R`, `app.R`, or `global.R`, Shiny will search the code for missing commas, extra commas, and unmatched braces, parens, and brackets, and will print out messages pointing out those problems. ([#1126](https://github.com/rstudio/shiny/pull/1126))

-*    **Reactlog visualization**: by default, the [`showReactLog()` function](http://shiny.rstudio.com/reference/shiny/latest/reactlog.html) (which brings up the reactive graph) also displays the time that each reactive and observer were active for:
+*    **Reactlog visualization**: by default, the [`showReactLog()` function](http://shiny.rstudio.com/reference/shiny/latest/showReactLog.html) (which brings up the reactive graph) also displays the time that each reactive and observer were active for:

      <p align="center">
      <img src="http://shiny.rstudio.com/images/reactlog.png" alt="modal-dialog" width="75%"/>
--- a/R/bootstrap-deprecated.R
+++ b/R/bootstrap-deprecated.R
@@ -45,3 +45,47 @@ headerPanel <- function(title, windowTitle=title) {
    )
  )
 }
+
+
+#' Create a Bootstrap page
+#'
+#' **DEPRECATED**: use [fluidPage()] instead.
+#'
+#' @param ... The contents of the document body.
+#' @param title The browser window title (defaults to the host URL of the page)
+#' @param responsive This option is deprecated; it is no longer optional with
+#'   Bootstrap 3.
+#' @param theme Alternative Bootstrap stylesheet (normally a css file within the
+#'   www directory, e.g. `www/bootstrap.css`)
+#'
+#' @return A UI defintion that can be passed to the [shinyUI] function.
+#'
+#' @keywords internal
+#' @seealso [fluidPage()], [fixedPage()]
+#' @export
+bootstrapPage <- function(..., title = NULL, responsive = NULL, theme = NULL) {
+
+  if (!is.null(responsive)) {
+    shinyDeprecated("The 'responsive' argument is no longer used with Bootstrap 3.")
+  }
+
+  attachDependencies(
+    tagList(
+      if (!is.null(title)) tags$head(tags$title(title)),
+      if (!is.null(theme)) {
+        tags$head(tags$link(rel="stylesheet", type="text/css", href = theme))
+      },
+
+      # remainder of tags passed to the function
+      list(...)
+    ),
+    bootstrapLib()
+  )
+}
+
+
+#' @rdname bootstrapPage
+#' @export
+basicPage <- function(...) {
+  bootstrapPage(div(class="container-fluid", list(...)))
+}
--- a/R/bootstrap-layout.R
+++ b/R/bootstrap-layout.R
@@ -28,8 +28,7 @@
 #'   Shiny-Application-Layout-Guide](http://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fluid
 #'   pages.
 #'
-#' @family layout functions
-#' @seealso [column()]
+#' @seealso [column()], [sidebarLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -131,8 +130,6 @@ fluidRow <- function(...) {
 #'   Shiny Application Layout Guide](http://shiny.rstudio.com/articles/layout-guide.html) for additional details on laying out fixed
 #'   pages.
 #'
-#' @family layout functions
-#'
 #' @seealso [column()]
 #'
 #' @examples
@@ -246,6 +243,7 @@ column <- function(width, ..., offset = 0) {
 #'   `title` tag within the head. You can also specify a page title
 #'   explicitly using the `title` parameter of the top-level page function.
 #'
+#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -281,8 +279,6 @@ titlePanel <- function(title, windowTitle=title) {
 #'   width must be 12 or less.
 #' @param ... Output elements to include in the sidebar/main panel.
 #'
-#' @family layout functions
-#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -373,7 +369,7 @@ mainPanel <- function(..., width = 8) {
 #' @param fluid `TRUE` to use fluid layout; `FALSE` to use fixed
 #'   layout.
 #'
-#' @family layout functions
+#' @seealso [fluidPage()], [flowLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -411,7 +407,7 @@ verticalLayout <- function(..., fluid = TRUE) {
 #' @param cellArgs Any additional attributes that should be used for each cell
 #'   of the layout.
 #'
-#' @family layout functions
+#' @seealso [verticalLayout()]
 #'
 #' @examples
 #' ## Only run examples in interactive R sessions
@@ -467,8 +463,6 @@ inputPanel <- function(...) {
 #' @param cellArgs Any additional attributes that should be used for each cell
 #'   of the layout.
 #'
-#' @family layout functions
-#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
--- a/R/bootstrap.R
+++ b/R/bootstrap.R
@@ -1,51 +1,6 @@
 #' @include utils.R
 NULL

-#' Create a Bootstrap page
-#'
-#' Create a Shiny UI page that loads the CSS and JavaScript for
-#' [Bootstrap](http://getbootstrap.com/), and has no content in the page
-#' body (other than what you provide).
-#'
-#' This function is primarily intended for users who are proficient in HTML/CSS,
-#' and know how to lay out pages in Bootstrap. Most applications should use
-#' [fluidPage()] along with layout functions like
-#' [fluidRow()] and [sidebarLayout()].
-#'
-#' @param ... The contents of the document body.
-#' @param title The browser window title (defaults to the host URL of the page)
-#' @param responsive This option is deprecated; it is no longer optional with
-#'   Bootstrap 3.
-#' @param theme Alternative Bootstrap stylesheet (normally a css file within the
-#'   www directory, e.g. `www/bootstrap.css`)
-#'
-#' @return A UI defintion that can be passed to the [shinyUI] function.
-#'
-#' @note The `basicPage` function is deprecated, you should use the
-#'   [fluidPage()] function instead.
-#'
-#' @seealso [fluidPage()], [fixedPage()]
-#' @export
-bootstrapPage <- function(..., title = NULL, responsive = NULL, theme = NULL) {
-
-  if (!is.null(responsive)) {
-    shinyDeprecated("The 'responsive' argument is no longer used with Bootstrap 3.")
-  }
-
-  attachDependencies(
-    tagList(
-      if (!is.null(title)) tags$head(tags$title(title)),
-      if (!is.null(theme)) {
-        tags$head(tags$link(rel="stylesheet", type="text/css", href = theme))
-      },
-
-      # remainder of tags passed to the function
-      list(...)
-    ),
-    bootstrapLib()
-  )
-}
-
 #' Bootstrap libraries
 #'
 #' This function returns a set of web dependencies necessary for using Bootstrap
@@ -76,12 +31,6 @@ bootstrapLib <- function(theme = NULL) {
  )
 }

-#' @rdname bootstrapPage
-#' @export
-basicPage <- function(...) {
-  bootstrapPage(div(class="container-fluid", list(...)))
-}
-

 #' Create a page that fills the window
 #'
@@ -130,8 +79,6 @@ basicPage <- function(...) {
 #' @param bootstrap If `TRUE`, load the Bootstrap CSS library.
 #' @param theme URL to alternative Bootstrap stylesheet.
 #'
-#' @family layout functions
-#'
 #' @examples
 #' fillPage(
 #'   tags$style(type = "text/css",
@@ -235,8 +182,6 @@ collapseSizes <- function(padding) {
 #'   [updateNavbarPage()], [insertTab()],
 #'   [showTab()]
 #'
-#' @family layout functions
-#'
 #' @examples
 #' navbarPage("App Title",
 #'   tabPanel("Plot"),
--- a/R/globals.R
+++ b/R/globals.R
@@ -16,9 +16,7 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
    registerS3method(generic, class, fun, envir = asNamespace(pkg))
  }

-  # Always register hook in case pkg is loaded at some
-  # point the future (or, potentially, but less commonly,
-  # unloaded & reloaded)
+  # Always register hook in case package is later unloaded & reloaded
  setHook(
    packageEvent(pkg, "onLoad"),
    function(...) {
@@ -27,37 +25,6 @@ register_s3_method <- function(pkg, generic, class, fun = NULL) {
  )
 }

-register_upgrade_message <- function(pkg, version) {
-  # Is an out-dated version of this package installed?
-  needs_upgrade <- function() {
-    if (system.file(package = pkg) == "")
-      return(FALSE)
-    if (utils::packageVersion(pkg) >= version)
-      return(FALSE)
-    TRUE
-  }
-
-  msg <- sprintf(
-    "This version of Shiny is designed to work with '%s' >= %s.
-    Please upgrade via install.packages('%s').",
-    pkg, version, pkg
-  )
-
-  if (pkg %in% loadedNamespaces() && needs_upgrade()) {
-    packageStartupMessage(msg)
-  }
-
-  # Always register hook in case pkg is loaded at some
-  # point the future (or, potentially, but less commonly,
-  # unloaded & reloaded)
-  setHook(
-    packageEvent(pkg, "onLoad"),
-    function(...) {
-      if (needs_upgrade()) packageStartupMessage(msg)
-    }
-  )
-}
-
 .onLoad <- function(libname, pkgname) {
  # R's lazy-loading package scheme causes the private seed to be cached in the
  # package itself, making our PRNG completely deterministic. This line resets
@@ -69,10 +36,18 @@ register_upgrade_message <- function(pkg, version) {
  register_s3_method("knitr", "knit_print", "reactive")
  register_s3_method("knitr", "knit_print", "shiny.appobj")
  register_s3_method("knitr", "knit_print", "shiny.render.function")
-
-  # Shiny 1.4.0 bumps jQuery 1.x to 3.x, which caused a problem
-  # with static-rendering of htmlwidgets, and htmlwidgets 1.5
-  # includes a fix for this problem
-  # https://github.com/rstudio/shiny/issues/2630
-  register_upgrade_message("htmlwidgets", 1.5)
+}
+
+.onAttach <- function(libname, pkgname) {
+  # Check for htmlwidgets version, if installed. As of Shiny 0.12.0 and
+  # htmlwidgets 0.4, both packages switched from RJSONIO to jsonlite. Because of
+  # this change, Shiny 0.12.0 will work only with htmlwidgets >= 0.4, and vice
+  # versa.
+  if (system.file(package = "htmlwidgets") != "" &&
+      utils::packageVersion("htmlwidgets") < "0.4") {
+    packageStartupMessage(
+      "This version of Shiny is designed to work with htmlwidgets >= 0.4. ",
+      "Please upgrade your version of htmlwidgets."
+    )
+  }
 }
--- a/R/input-action.R
+++ b/R/input-action.R
@@ -37,13 +37,6 @@
 #' }
 #'
 #' @seealso [observeEvent()] and [eventReactive()]
-#'
-#' @section Server value:
-#' An integer of class `"shinyActionButtonValue"`. This class differs from
-#' ordinary integers in that a value of 0 is considered "falsy".
-#' This implies two things:
-#'   * Event handlers (e.g., [observeEvent()], [eventReactive()]) won't execute on initial load.
-#'   * Input validation (e.g., [req()], [need()]) will fail on initial load.
 #' @export
 actionButton <- function(inputId, label, icon = NULL, width = NULL, ...) {

--- a/R/input-checkbox.R
+++ b/R/input-checkbox.R
@@ -22,10 +22,6 @@
 #' }
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' `TRUE` if checked, `FALSE` otherwise.
-#'
 #' @export
 checkboxInput <- function(inputId, label, value = FALSE, width = NULL) {

--- a/R/input-checkboxgroup.R
+++ b/R/input-checkboxgroup.R
@@ -67,9 +67,6 @@
 #'
 #' shinyApp(ui, server)
 #' }
-#' @section Server value:
-#' Character vector of values corresponding to the boxes that are checked.
-#'
 #' @export
 checkboxGroupInput <- function(inputId, label, choices = NULL, selected = NULL,
  inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {
--- a/R/input-date.R
+++ b/R/input-date.R
@@ -86,10 +86,6 @@
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
-#'
-#' @section Server value:
-#' A [Date] vector of length 1.
-#'
 #' @export
 dateInput <- function(inputId, label, value = NULL, min = NULL, max = NULL,
  format = "yyyy-mm-dd", startview = "month", weekstart = 0,
--- a/R/input-daterange.R
+++ b/R/input-daterange.R
@@ -70,10 +70,6 @@
 #'
 #' shinyApp(ui, server = function(input, output) { })
 #' }
-#'
-#' @section Server value:
-#' A [Date] vector of length 2.
-#'
 #' @export
 dateRangeInput <- function(inputId, label, start = NULL, end = NULL,
    min = NULL, max = NULL, format = "yyyy-mm-dd", startview = "month",
--- a/R/input-file.R
+++ b/R/input-file.R
@@ -3,7 +3,21 @@
 #' Create a file upload control that can be used to upload one or more files.
 #'
 #' Whenever a file upload completes, the corresponding input variable is set
-#' to a dataframe. See the `Server value` section.
+#' to a dataframe. This dataframe contains one row for each selected file, and
+#' the following columns:
+#' \describe{
+#'   \item{`name`}{The filename provided by the web browser. This is
+#'   **not** the path to read to get at the actual data that was uploaded
+#'   (see
+#'   `datapath` column).}
+#'   \item{`size`}{The size of the uploaded data, in
+#'   bytes.}
+#'   \item{`type`}{The MIME type reported by the browser (for example,
+#'   `text/plain`), or empty string if the browser didn't know.}
+#'   \item{`datapath`}{The path to a temp file that contains the data that was
+#'   uploaded. This file may be deleted if the user performs another upload
+#'   operation.}
+#' }
 #'
 #' @family input elements
 #'
@@ -57,23 +71,6 @@
 #'
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' A `data.frame` that contains one row for each selected file, and following columns:
-#' \describe{
-#'   \item{`name`}{The filename provided by the web browser. This is
-#'   **not** the path to read to get at the actual data that was uploaded
-#'   (see
-#'   `datapath` column).}
-#'   \item{`size`}{The size of the uploaded data, in
-#'   bytes.}
-#'   \item{`type`}{The MIME type reported by the browser (for example,
-#'   `text/plain`), or empty string if the browser didn't know.}
-#'   \item{`datapath`}{The path to a temp file that contains the data that was
-#'   uploaded. This file may be deleted if the user performs another upload
-#'   operation.}
-#' }
-#'
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
--- a/R/input-numeric.R
+++ b/R/input-numeric.R
@@ -24,10 +24,6 @@
 #' }
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' A numeric vector of length 1.
-#'
 #' @export
 numericInput <- function(inputId, label, value, min = NA, max = NA, step = NA,
  width = NULL) {
--- a/R/input-password.R
+++ b/R/input-password.R
@@ -8,10 +8,6 @@
 #' @family input elements
 #' @seealso [updateTextInput()]
 #'
-#' @section Server value:
-#' A character string of the password input. The default value is `""`
-#' unless `value` is provided.
-#'
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
--- a/R/input-radiobuttons.R
+++ b/R/input-radiobuttons.R
@@ -80,10 +80,6 @@
 #'
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' A character string containing the value of the selected button.
-#'
 #' @export
 radioButtons <- function(inputId, label, choices = NULL, selected = NULL,
  inline = FALSE, width = NULL, choiceNames = NULL, choiceValues = NULL) {
--- a/R/input-select.R
+++ b/R/input-select.R
@@ -3,32 +3,33 @@
 #' Create a select list that can be used to choose a single or multiple items
 #' from a list of values.
 #'
-#' By default, `selectInput()` and `selectizeInput()` use the JavaScript library
-#' \pkg{selectize.js} (<https://github.com/selectize/selectize.js>) instead of
-#' the basic select input element. To use the standard HTML select input
-#' element, use `selectInput()` with `selectize=FALSE`.
+#' By default, `selectInput()` and `selectizeInput()` use the
+#' JavaScript library \pkg{selectize.js}
+#' (<https://github.com/selectize/selectize.js>) instead of the basic
+#' select input element. To use the standard HTML select input element, use
+#' `selectInput()` with `selectize=FALSE`.
 #'
-#' In selectize mode, if the first element in `choices` has a value of `""`, its
-#' name will be treated as a placeholder prompt. For example:
+#' In selectize mode, if the first element in `choices` has a value of
+#' `""`, its name will be treated as a placeholder prompt. For example:
 #' `selectInput("letter", "Letter", c("Choose one" = "", LETTERS))`
 #'
 #' @inheritParams textInput
 #' @param choices List of values to select from. If elements of the list are
 #'   named, then that name --- rather than the value --- is displayed to the
 #'   user. It's also possible to group related inputs by providing a named list
-#'   whose elements are (either named or unnamed) lists, vectors, or factors. In
-#'   this case, the outermost names will be used as the group labels (leveraging
-#'   the `<optgroup>` HTML tag) for the elements in the respective sublist. See
-#'   the example section for a small demo of this feature.
-#' @param selected The initially selected value (or multiple values if `multiple
-#'   = TRUE`). If not specified then defaults to the first value for
-#'   single-select lists and no values for multiple select lists.
+#'   whose elements are (either named or unnamed) lists, vectors, or factors. In this
+#'   case, the outermost names will be used as the group labels (leveraging the
+#'   `<optgroup>` HTML tag) for the elements in the respective sublist. See the
+#'   example section for a small demo of this feature.
+#' @param selected The initially selected value (or multiple values if
+#'   `multiple = TRUE`). If not specified then defaults to the first value
+#'   for single-select lists and no values for multiple select lists.
 #' @param multiple Is selection of multiple items allowed?
 #' @param selectize Whether to use \pkg{selectize.js} or not.
 #' @param size Number of items to show in the selection box; a larger number
 #'   will result in a taller box. Not compatible with `selectize=TRUE`.
-#'   Normally, when `multiple=FALSE`, a select input will be a drop-down list,
-#'   but when `size` is set, it will be a box instead.
+#'   Normally, when `multiple=FALSE`, a select input will be a drop-down
+#'   list, but when `size` is set, it will be a box instead.
 #' @return A select list control that can be added to a UI definition.
 #'
 #' @family input elements
@@ -71,11 +72,6 @@
 #'   }
 #' )
 #' }
-#'
-#' @section Server value: A vector of character strings, usually of length
-#'   1, with the value of the selected items. When `multiple=TRUE` and
-#'   nothing is selected, this value will be `NULL`.
-#'
 #' @export
 selectInput <- function(inputId, label, choices, selected = NULL,
  multiple = FALSE, selectize = TRUE, width = NULL,
@@ -229,6 +225,18 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 #' Create a select list that can be used to choose a single or multiple items
 #' from the column names of a data frame.
 #'
+#' The resulting server `input` value will be returned as:
+#' \itemize{
+#'   \item a symbol if `multiple = FALSE`.  The `input` value should be
+#'         used with rlang's [rlang::!!()]. For example,
+#'         `ggplot2::aes(!!input$variable)`.
+#'   \item a list of symbols if `multiple = TRUE`. The `input` value
+#'         should be used with rlang's [rlang::!!!()] to expand
+#'         the symbol list as individual arguments. For example,
+#'         `dplyr::select(mtcars, !!!input$variabls)` which is
+#'         equivalent to `dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])`.
+#' }
+#'
 #' By default, `varSelectInput()` and `selectizeInput()` use the
 #' JavaScript library \pkg{selectize.js}
 #' (<https://github.com/selectize/selectize.js>) to instead of the basic
@@ -241,19 +249,6 @@ selectizeIt <- function(inputId, select, options, nonempty = FALSE) {
 #'
 #' @family input elements
 #' @seealso [updateSelectInput()]
-#'
-#' @section Server value:
-#' The resulting server `input` value will be returned as:
-#'
-#'  * A symbol if `multiple = FALSE`. The `input` value should be
-#'  used with rlang's [rlang::!!()]. For example,
-#'  `ggplot2::aes(!!input$variable)`.
-#'  * A list of symbols if `multiple = TRUE`. The `input` value
-#'  should be used with rlang's [rlang::!!!()] to expand
-#'  the symbol list as individual arguments. For example,
-#'  `dplyr::select(mtcars, !!!input$variabls)` which is
-#'  equivalent to `dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])`.
-#'
 #' @examples
 #'
 #' ## Only run examples in interactive R sessions
--- a/R/input-slider.R
+++ b/R/input-slider.R
@@ -70,10 +70,6 @@
 #' # Complete app with UI and server components
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' A number, or in the case of slider range, a vector of two numbers.
-#'
 #' @export
 sliderInput <- function(inputId, label, min, max, value, step = NULL,
                        round = FALSE, format = NULL, locale = NULL,
--- a/R/input-text.R
+++ b/R/input-text.R
@@ -28,11 +28,6 @@
 #' }
 #' shinyApp(ui, server)
 #' }
-#'
-#' @section Server value:
-#' A character string of the text input. The default value is `""`
-#' unless `value` is provided.
-#'
 #' @export
 textInput <- function(inputId, label, value = "", width = NULL,
  placeholder = NULL) {
--- a/R/input-textarea.R
+++ b/R/input-textarea.R
@@ -35,11 +35,6 @@
 #' shinyApp(ui, server)
 #'
 #' }
-#'
-#' @section Server value:
-#' A character string of the text input. The default value is `""`
-#' unless `value` is provided.
-#'
 #' @export
 textAreaInput <- function(inputId, label, value = "", width = NULL, height = NULL,
  cols = NULL, rows = NULL, placeholder = NULL, resize = NULL) {
--- a/R/input-utils.R
+++ b/R/input-utils.R
@@ -92,10 +92,7 @@ generateOptions <- function(inputId, selected, inline, type = 'checkbox',

 # True when a choice list item represents a group of related inputs.
 isGroup <- function(choice) {
-  is.list(choice) ||
-    !is.null(names(choice)) ||
-    length(choice) > 1 ||
-    length(choice) == 0
+  length(choice) > 1 || !is.null(names(choice))
 }

 # True when choices is a list and contains at least one group of related inputs.
@@ -134,10 +131,6 @@ processFlatChoices <- function(choices) {
 processGroupedChoices <- function(choices) {
  # We assert choices is a list, since only a list may contain a group.
  stopifnot(is.list(choices))
-  # The list might be unnamed by this point. We add default names of "" so that
-  # names(choices) is not zero-length and mapply can work. Within mapply, we
-  # error if any group's name is ""
-  choices <- asNamed(choices)
  choices <- mapply(function(name, choice) {
    choiceIsGroup <- isGroup(choice)
    if (choiceIsGroup && name == "") {
--- a/R/middleware-shiny.R
+++ b/R/middleware-shiny.R
@@ -3,27 +3,7 @@ NULL

 reactLogHandler <- function(req) {
  if (! rLog$isLogging()) {
-    if (
-      identical(req$PATH_INFO, "/reactlog/mark") ||
-      identical(req$PATH_INFO, "/reactlog")
-    ) {
-      # is not logging, but is a reactlog path...
-
-      return(
-        httpResponse(
-          # Not Implemented
-          # - The server either does not recognize the request method, or it lacks the ability to fulfil the request.
-          status = 501,
-          content_type = "text/plain; charset=utf-8",
-          content = "To enable reactlog, set the following option before running the application: \n\noptions(shiny.reactlog = TRUE)"
-        )
-      )
-
-    } else {
-      # continue on like normal
-      return(NULL)
-    }
-
+    return(NULL)
  }

  if (identical(req$PATH_INFO, "/reactlog/mark")) {
@@ -57,7 +37,6 @@ reactLogHandler <- function(req) {
    ))

  } else {
-    # continue on like normal
    return(NULL)
  }
 }
--- a/R/notifications.R
+++ b/R/notifications.R
@@ -12,13 +12,11 @@
 #'   disappear.
 #' @param closeButton If `TRUE`, display a button which will make the
 #'   notification disappear when clicked. If `FALSE` do not display.
-#' @param id A unique identifier for the notification.
-#'
-#'   `id` is optional for `showNotification()`: Shiny will automatically create
-#'   one if needed. If you do supply it, Shiny will update an existing
-#'   notification if it exists, otherwise it will create a new one.
-#'
-#'   `id` is required for `removeNotification()`.
+#' @param id An ID string. This can be used to change the contents of an
+#'   existing message with `showNotification`, or to remove it with
+#'   `removeNotification`. If not provided, one will be generated
+#'   automatically. If an ID is provided and there does not currently exist a
+#'   notification with that ID, a new notification will be created with that ID.
 #' @param type A string which controls the color of the notification. One of
 #'   "default" (gray), "message" (blue), "warning" (yellow), or "error" (red).
 #' @param session Session object to send notification to.
@@ -99,8 +97,10 @@ showNotification <- function(ui, action = NULL, duration = 5,

 #' @rdname showNotification
 #' @export
-removeNotification <- function(id, session = getDefaultReactiveDomain()) {
-  force(id)
+removeNotification <- function(id = NULL, session = getDefaultReactiveDomain()) {
+  if (is.null(id)) {
+    stop("id is required.")
+  }
  session$sendNotification("remove", id)
  id
 }
--- a/R/render-plot.R
+++ b/R/render-plot.R
@@ -889,14 +889,6 @@ find_panel_info_non_api <- function(b, ggplot_format) {
  })
 }

-# Use public API for getting the unit's type (grid::unitType(), added in R 4.0)
-# https://github.com/wch/r-source/blob/f9b8a42/src/library/grid/R/unit.R#L179
-getUnitType <- function(u) {
-  tryCatch(
-    get("unitType", envir = asNamespace("grid"))(u),
-    error = function(e) attr(u, "unit", exact = TRUE)
-  )
-}

 # Given a gtable object, return the x and y ranges (in pixel dimensions)
 find_panel_ranges <- function(g, res) {
@@ -912,11 +904,11 @@ find_panel_ranges <- function(g, res) {
    if (inherits(x, "unit.list")) {
      # For ggplot2 <= 1.0.1
      vapply(x, FUN.VALUE = logical(1), function(u) {
-        isTRUE(getUnitType(u) == "null")
+        isTRUE(attr(u, "unit", exact = TRUE) == "null")
      })
    } else {
      # For later versions of ggplot2
-      getUnitType(x) == "null"
+      attr(x, "unit", exact = TRUE) == "null"
    }
  }

@@ -956,11 +948,7 @@ find_panel_ranges <- function(g, res) {

    # The plotting panels all are 'null' units.
    null_sizes <- rep(NA_real_, length(rel_sizes))
-    # Workaround for `[.unit` forbidding zero-length subsets
-    # https://github.com/wch/r-source/blob/f9b8a42/src/library/grid/R/unit.R#L448-L450
-    if (length(null_idx)) {
-      null_sizes[null_idx] <- as.numeric(rel_sizes[null_idx])
-    }
+    null_sizes[null_idx] <- as.numeric(rel_sizes[null_idx])

    # Total size allocated for panels is the total image size minus absolute
    # (non-panel) elements.
--- a/R/shiny-options.R
+++ b/R/shiny-options.R
@@ -35,7 +35,7 @@ getShinyOption <- function(name, default = NULL) {
 #' `shinyOptions()`.
 #'
 #' \describe{
-#'   \item{shiny.autoreload (defaults to `FALSE`)}{If `TRUE` when a Shiny app is launched, the
+#'   \item{shiny.autoreload}{If `TRUE` when a Shiny app is launched, the
 #'     app directory will be continually monitored for changes to files that
 #'     have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
 #'     changes are detected, all connected Shiny sessions are reloaded. This
@@ -51,63 +51,62 @@ getShinyOption <- function(name, default = NULL) {
 #'     The default polling interval is 500 milliseconds. You can change this
 #'     by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
 #'     two seconds).}
-#'   \item{shiny.deprecation.messages (defaults to `TRUE`)}{This controls whether messages for
+#'   \item{shiny.deprecation.messages}{This controls whether messages for
 #'     deprecated functions in Shiny will be printed. See
 #'     [shinyDeprecated()] for more information.}
-#'   \item{shiny.error (defaults to `NULL`)}{This can be a function which is called when an error
+#'   \item{shiny.error}{This can be a function which is called when an error
 #'     occurs. For example, `options(shiny.error=recover)` will result a
 #'     the debugger prompt when an error occurs.}
-#'   \item{shiny.fullstacktrace (defaults to `FALSE`)}{Controls whether "pretty" (`FALSE`) or full
-#'     stack traces (`TRUE`) are dumped to the console when errors occur during Shiny app execution.
-#'     Pretty stack traces attempt to only show user-supplied code, but this pruning can't always
-#'     be done 100\% correctly.}
-#'   \item{shiny.host (defaults to `"127.0.0.1"`)}{The IP address that Shiny should listen on. See
+#'   \item{shiny.fullstacktrace}{Controls whether "pretty" or full stack traces
+#'     are dumped to the console when errors occur during Shiny app execution.
+#'     The default is `FALSE` (pretty stack traces).}
+#'   \item{shiny.host}{The IP address that Shiny should listen on. See
 #'     [runApp()] for more information.}
-#'   \item{shiny.jquery.version (defaults to `3`)}{The major version of jQuery to use.
-#'   Currently only values of `3` or `1` are supported. If `1`, then jQuery 1.12.4 is used. If `3`,
-#'   then jQuery 3.4.1 is used.}
-#'   \item{shiny.json.digits (defaults to `16`)}{The number of digits to use when converting
+#'   \item{shiny.json.digits}{The number of digits to use when converting
 #'     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
+#'   \item{shiny.launch.browser}{A boolean which controls the default behavior
 #'     when an app is run. See [runApp()] for more information.}
-#'   \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
-#'     Whether or not to include Shiny's JavaScript as a minified (`shiny.min.js`)
-#'     or un-minified (`shiny.js`) file. The un-minified version is larger,
-#'     but can be helpful for development and debugging.}
-#'   \item{shiny.port (defaults to a random open port)}{A port number that Shiny will listen on. See
+#'   \item{shiny.maxRequestSize}{This is a number which specifies the maximum
+#'     web request size, which serves as a size limit for file uploads. If
+#'     unset, the maximum request size defaults to 5MB.}
+#'   \item{shiny.minified}{If this is `TRUE` or unset (the default), then
+#'     Shiny will use minified JavaScript (`shiny.min.js`). If
+#'     `FALSE`, then Shiny will use the un-minified JavaScript
+#'     (`shiny.js`); this can be useful during development.}
+#'   \item{shiny.port}{A port number that Shiny will listen on. See
 #'     [runApp()] for more information.}
-#'   \item{shiny.reactlog (defaults to `FALSE`)}{If `TRUE`, enable logging of reactive events,
+#'   \item{shiny.reactlog}{If `TRUE`, enable logging of reactive events,
 #'     which can be viewed later with the [reactlogShow()] function.
 #'     This incurs a substantial performance penalty and should not be used in
 #'     production.}
-#'   \item{shiny.sanitize.errors (defaults to `FALSE`)}{If `TRUE`, then normal errors (i.e.
+#'   \item{shiny.sanitize.errors}{If `TRUE`, then normal errors (i.e.
 #'     errors not wrapped in `safeError`) won't show up in the app; a simple
 #'     generic error message is printed instead (the error and strack trace printed
-#'     to the console remain unchanged). If you want to sanitize errors in general, but you DO want a
+#'     to the console remain unchanged). The default is `FALSE` (unsanitized
+#'     errors).If you want to sanitize errors in general, but you DO want a
 #'     particular error `e` to get displayed to the user, then set this option
 #'     to `TRUE` and use `stop(safeError(e))` for errors you want the
 #'     user to see.}
-#'   \item{shiny.stacktraceoffset (defaults to `TRUE`)}{If `TRUE`, then Shiny's printed stack
+#'   \item{shiny.stacktraceoffset}{If `TRUE`, then Shiny's printed stack
 #'     traces will display srcrefs one line above their usual location. This is
 #'     an arguably more intuitive arrangement for casual R users, as the name
 #'     of a function appears next to the srcref where it is defined, rather than
 #'     where it is currently being called from.}
-#'   \item{shiny.suppressMissingContextError (defaults to `FALSE`)}{Normally, invoking a reactive
+#'   \item{shiny.suppressMissingContextError}{Normally, invoking a reactive
 #'     outside of a reactive context (or [isolate()]) results in
 #'     an error. If this is `TRUE`, don't error in these cases. This
 #'     should only be used for debugging or demonstrations of reactivity at the
 #'     console.}
-#'   \item{shiny.testmode (defaults to `FALSE`)}{If `TRUE`, then various features for testing Shiny
-#'     applications are enabled.}
-#'   \item{shiny.trace (defaults to `FALSE`)}{Print messages sent between the R server and the web
+#'   \item{shiny.table.class}{CSS class names to use for tables.}
+#'   \item{shiny.testmode}{If `TRUE`, then enable features for testing Shiny
+#'     applications. If `FALSE` (the default), do not enable those features.}
+#'   \item{shiny.trace}{Print messages sent between the R server and the web
 #'     browser client to the R console. This is useful for debugging. Possible
 #'     values are `"send"` (only print messages sent to the client),
 #'     `"recv"` (only print messages received by the server), `TRUE`
 #'     (print all messages), or `FALSE` (default; don't print any of these
 #'     messages).}
-#'   \item{shiny.usecairo (defaults to `TRUE`)}{This is used to disable graphical rendering by the
+#'   \item{shiny.usecairo}{This is used to disable graphical rendering by the
 #'     Cairo package, if it is installed. See [plotPNG()] for more
 #'     information.}
 #' }
--- a/R/shinyui.R
+++ b/R/shinyui.R
@@ -42,28 +42,9 @@ renderPage <- function(ui, connection, showcase=0, testMode=FALSE) {
    )
  }

-  jquery <- function() {
-    version <- getOption("shiny.jquery.version", 3)
-    if (version == 3) {
-      return(htmlDependency(
-        "jquery", "3.4.1",
-        c(href = "shared"),
-        script = "jquery.min.js"
-      ))
-    }
-    if (version == 1) {
-      return(htmlDependency(
-        "jquery", "1.12.4",
-        c(href = "shared/legacy"),
-        script = "jquery.min.js"
-      ))
-    }
-    stop("Unsupported version of jQuery: ", version)
-  }
-
  shiny_deps <- list(
    htmlDependency("json2", "2014.02.04", c(href="shared"), script = "json2-min.js"),
-    jquery(),
+    htmlDependency("jquery", "3.4.1", c(href="shared"), script = "jquery.min.js"),
    htmlDependency("shiny", utils::packageVersion("shiny"), c(href="shared"),
      script = if (getOption("shiny.minified", TRUE)) "shiny.min.js" else "shiny.js",
      stylesheet = "shiny.css")
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ The Javascript code in Shiny is minified using tools that run on Node.js. See th

 ## Guidelines for contributing

-We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](https://github.com/rstudio/shiny/blob/master/.github/CONTRIBUTING.md) file for detailed guidelines of how to contribute.
+We welcome contributions to the **shiny** package. Please see our [CONTRIBUTING.md](CONTRIBUTING.md) file for detailed guidelines of how to contribute.

 ## License

--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,9 +16,6 @@ cache:
 # Adapt as necessary starting from here

 build_script:
-  - travis-tool.sh install_github rstudio/htmltools@rc-v0.4.0
-  - travis-tool.sh install_github rstudio/promises@rc-v1.1.0
-  - travis-tool.sh install_github r-lib/later@rc-v1.0.0
  - travis-tool.sh install_deps

 test_script:
--- a/inst/_pkgdown.yml
+++ b/inst/_pkgdown.yml
@@ -1,217 +0,0 @@
-# NOTE: The main Shiny site, https://shiny.rstudio.com/, is not a pkgdown site.
-# However, as part of the build process for that site
-# (rstudio/shiny-dev-center), we do use pkgdown to generate the function
-# reference index pages for each release. This file configures the look of
-# those pages for releases from 1.4 onward.  Prior to 1.4, staticdocs from
-# https://github.com/r-lib/pkgdown/releases/tag/old was used and
-# inst/staticdocs/index.r was its configuration.
-template:
-  # NOTE: These templates live in shiny-dev-center
-  path: _pkgdown_templates
-reference:
-  - title: UI Layout
-    desc: Functions for laying out the user interface for your application.
-    contents:
-      - absolutePanel
-      - bootstrapPage
-      - column
-      - conditionalPanel
-      - fillPage
-      - fillRow
-      - fixedPage
-      - fluidPage
-      - helpText
-      - icon
-      - navbarPage
-      - navlistPanel
-      - sidebarLayout
-      - tabPanel
-      - tabsetPanel
-      - titlePanel
-      - inputPanel
-      - flowLayout
-      - splitLayout
-      - verticalLayout
-      - wellPanel
-      - withMathJax
-  - title: UI Inputs
-    desc: Functions for creating user interface elements that prompt the user for input values or interaction.
-    contents:
-      - actionButton
-      - checkboxGroupInput
-      - checkboxInput
-      - dateInput
-      - dateRangeInput
-      - fileInput
-      - numericInput
-      - radioButtons
-      - selectInput
-      - varSelectInput
-      - sliderInput
-      - submitButton
-      - textInput
-      - textAreaInput
-      - passwordInput
-      - modalButton
-      - updateActionButton
-      - updateCheckboxGroupInput
-      - updateCheckboxInput
-      - updateDateInput
-      - updateDateRangeInput
-      - updateNumericInput
-      - updateRadioButtons
-      - updateSelectInput
-      - updateSliderInput
-      - updateTabsetPanel
-      - insertTab
-      - showTab
-      - updateTextInput
-      - updateTextAreaInput
-      - updateQueryString
-      - getQueryString
-  - title: UI Outputs
-    desc: Functions for creating user interface elements that, in conjunction with rendering functions, display different kinds of output from your application.
-    contents:
-      - htmlOutput
-      - plotOutput
-      - outputOptions
-      - tableOutput
-      - textOutput
-      - verbatimTextOutput
-      - downloadButton
-      - Progress
-      - withProgress
-      - modalDialog
-      - urlModal
-      - showModal
-      - showNotification
-  - title: Interface builder functions
-    desc: A sub-library for writing HTML using R functions. These functions form the foundation on which the higher level user interface functions are built, and can also be used in your Shiny UI to provide custom HTML, CSS, and JavaScript.
-    contents:
-      - builder
-      - HTML
-      - include
-      - singleton
-      - tag
-      - validateCssUnit
-      - withTags
-      - htmlTemplate
-      - bootstrapLib
-      - suppressDependencies
-      - insertUI
-      - removeUI
-  - title: Rendering functions
-    desc: Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.
-    contents:
-      - renderPlot
-      - renderCachedPlot
-      - renderText
-      - renderPrint
-      - renderDataTable
-      - renderImage
-      - renderTable
-      - renderUI
-      - downloadHandler
-      - createRenderFunction
-  - title: Reactive programming
-    desc: A sub-library that provides reactive programming facilities for R.
-    contents:
-      - reactive
-      - observe
-      - observeEvent
-      - reactiveVal
-      - reactiveValues
-      - reactiveValuesToList
-      - is.reactivevalues
-      - isolate
-      - invalidateLater
-      - debounce
-      - reactlog
-      - makeReactiveBinding
-      - reactiveFileReader
-      - reactivePoll
-      - reactiveTimer
-      - domains
-      - freezeReactiveValue
-  - title: Boilerplate
-    desc: Functions that are required boilerplate in ui.R and server.R.
-    contents:
-      - shinyUI
-      - shinyServer
-  - title: Running
-    desc: Functions that are used to run or stop Shiny applications.
-    contents:
-      - runApp
-      - runGadget
-      - runExample
-      - runGadget
-      - runUrl
-      - stopApp
-      - viewer
-      - isRunning
-      - loadSupport
-  - title: Bookmarking state
-    desc: Functions that are used for bookmarking and restoring state.
-    contents:
-      - bookmarkButton
-      - enableBookmarking
-      - setBookmarkExclude
-      - showBookmarkUrlModal
-      - onBookmark
-  - title: Extending Shiny
-    desc: Functions that are intended to be called by third-party packages that extend Shiny.
-    contents:
-      - createWebDependency
-      - resourcePaths
-      - registerInputHandler
-      - removeInputHandler
-      - markRenderFunction
-  - title: Utility functions
-    desc: Miscellaneous utilities that may be useful to advanced users or when extending Shiny.
-    contents:
-      - req
-      - validate
-      - session
-      - shinyOptions
-      - safeError
-      - onFlush
-      - restoreInput
-      - applyInputHandlers
-      - exprToFunction
-      - installExprFunction
-      - parseQueryString
-      - getCurrentOutputInfo
-      - plotPNG
-      - sizeGrowthRatio
-      - exportTestValues
-      - setSerializer
-      - snapshotExclude
-      - snapshotPreprocessInput
-      - snapshotPreprocessOutput
-      - markOutputAttrs
-      - repeatable
-      - shinyDeprecated
-      - serverInfo
-      - onStop
-      - diskCache
-      - memoryCache
-      - reexports
-  - title: Plot interaction
-    desc: Functions related to interactive plots
-    contents:
-      - brushedPoints
-      - brushOpts
-      - clickOpts
-      - dblclickOpts
-      - hoverOpts
-      - nearPoints
-  - title: Modules
-    desc: Functions for modularizing Shiny apps
-    contents:
-      - NS
-      - callModule
-  - title: Embedding
-    desc: Functions that are intended for third-party packages that embed Shiny applications.
-    contents:
-      - shinyApp
-      - maskReactiveContext
--- a/inst/staticdocs/index.r
+++ b/inst/staticdocs/index.r
@@ -0,0 +1,234 @@
+sd_section("UI Layout",
+  "Functions for laying out the user interface for your application.",
+  c(
+    "absolutePanel",
+    "bootstrapPage",
+    "column",
+    "conditionalPanel",
+    "fillPage",
+    "fillRow",
+    "fixedPage",
+    "fluidPage",
+    "helpText",
+    "icon",
+    "navbarPage",
+    "navlistPanel",
+    "sidebarLayout",
+    "tabPanel",
+    "tabsetPanel",
+    "titlePanel",
+    "inputPanel",
+    "flowLayout",
+    "splitLayout",
+    "verticalLayout",
+    "wellPanel",
+    "withMathJax"
+  )
+)
+sd_section("UI Inputs",
+  "Functions for creating user interface elements that prompt the user for input values or interaction.",
+  c(
+    "actionButton",
+    "checkboxGroupInput",
+    "checkboxInput",
+    "dateInput",
+    "dateRangeInput",
+    "fileInput",
+    "numericInput",
+    "radioButtons",
+    "selectInput",
+    "varSelectInput",
+    "sliderInput",
+    "submitButton",
+    "textInput",
+    "textAreaInput",
+    "passwordInput",
+    "modalButton",
+    "updateActionButton",
+    "updateCheckboxGroupInput",
+    "updateCheckboxInput",
+    "updateDateInput",
+    "updateDateRangeInput",
+    "updateNumericInput",
+    "updateRadioButtons",
+    "updateSelectInput",
+    "updateSliderInput",
+    "updateTabsetPanel",
+    "insertTab",
+    "showTab",
+    "updateTextInput",
+    "updateTextAreaInput",
+    "updateQueryString",
+    "getQueryString"
+  )
+)
+sd_section("UI Outputs",
+  "Functions for creating user interface elements that, in conjunction with rendering functions, display different kinds of output from your application.",
+  c(
+    "htmlOutput",
+    "plotOutput",
+    "outputOptions",
+    "tableOutput",
+    "textOutput",
+    "verbatimTextOutput",
+    "downloadButton",
+    "Progress",
+    "withProgress",
+    "modalDialog",
+    "urlModal",
+    "showModal",
+    "showNotification"
+  )
+)
+sd_section("Interface builder functions",
+  "A sub-library for writing HTML using R functions. These functions form the foundation on which the higher level user interface functions are built, and can also be used in your Shiny UI to provide custom HTML, CSS, and JavaScript.",
+  c(
+    "builder",
+    "HTML",
+    "include",
+    "singleton",
+    "tag",
+    "validateCssUnit",
+    "withTags",
+    "htmlTemplate",
+    "bootstrapLib",
+    "suppressDependencies",
+    "insertUI",
+    "removeUI"
+  )
+)
+sd_section("Rendering functions",
+  "Functions that you use in your application's server side code, assigning them to outputs that appear in your user interface.",
+  c(
+    "renderPlot",
+    "renderCachedPlot",
+    "renderText",
+    "renderPrint",
+    "renderDataTable",
+    "renderImage",
+    "renderTable",
+    "renderUI",
+    "downloadHandler",
+    "createRenderFunction"
+  )
+)
+sd_section("Reactive programming",
+  "A sub-library that provides reactive programming facilities for R.",
+  c(
+    "reactive",
+    "observe",
+    "observeEvent",
+    "reactiveVal",
+    "reactiveValues",
+    "reactiveValuesToList",
+    "is.reactivevalues",
+    "isolate",
+    "invalidateLater",
+    "debounce",
+    "reactlog",
+    "makeReactiveBinding",
+    "reactiveFileReader",
+    "reactivePoll",
+    "reactiveTimer",
+    "domains",
+    "freezeReactiveValue"
+  )
+)
+sd_section("Boilerplate",
+  "Functions that are required boilerplate in ui.R and server.R.",
+  c(
+    "shinyUI",
+    "shinyServer"
+  )
+)
+sd_section("Running",
+  "Functions that are used to run or stop Shiny applications.",
+  c(
+    "runApp",
+    "runGadget",
+    "runExample",
+    "runGadget",
+    "runUrl",
+    "stopApp",
+    "viewer",
+    "isRunning",
+    "loadSupport"
+  )
+)
+sd_section("Bookmarking state",
+  "Functions that are used for bookmarking and restoring state.",
+  c(
+    "bookmarkButton",
+    "enableBookmarking",
+    "setBookmarkExclude",
+    "showBookmarkUrlModal",
+    "onBookmark"
+  )
+)
+sd_section("Extending Shiny",
+  "Functions that are intended to be called by third-party packages that extend Shiny.",
+  c(
+    "createWebDependency",
+    "resourcePaths",
+    "registerInputHandler",
+    "removeInputHandler",
+    "markRenderFunction"
+  )
+)
+sd_section("Utility functions",
+  "Miscellaneous utilities that may be useful to advanced users or when extending Shiny.",
+  c(
+    "req",
+    "validate",
+    "session",
+    "shinyOptions",
+    "safeError",
+    "onFlush",
+    "restoreInput",
+    "applyInputHandlers",
+    "exprToFunction",
+    "installExprFunction",
+    "parseQueryString",
+    "getCurrentOutputInfo",
+    "plotPNG",
+    "sizeGrowthRatio",
+    "exportTestValues",
+    "setSerializer",
+    "snapshotExclude",
+    "snapshotPreprocessInput",
+    "snapshotPreprocessOutput",
+    "markOutputAttrs",
+    "repeatable",
+    "shinyDeprecated",
+    "serverInfo",
+    "onStop",
+    "diskCache",
+    "memoryCache",
+    "reexports"
+  )
+)
+sd_section("Plot interaction",
+  "Functions related to interactive plots",
+  c(
+    "brushedPoints",
+    "brushOpts",
+    "clickOpts",
+    "dblclickOpts",
+    "hoverOpts",
+    "nearPoints"
+  )
+)
+sd_section("Modules",
+  "Functions for modularizing Shiny apps",
+  c(
+    "NS",
+    "callModule"
+  )
+)
+sd_section("Embedding",
+  "Functions that are intended for third-party packages that embed Shiny applications.",
+  c(
+    "shinyApp",
+    "maskReactiveContext"
+  )
+)
--- a/inst/www/shared/legacy/jquery-AUTHORS.txt
+++ b/inst/www/shared/legacy/jquery-AUTHORS.txt
@@ -1,266 +0,0 @@
-Authors ordered by first contribution.
-
-John Resig <jeresig@gmail.com>
-Gilles van den Hoven <gilles0181@gmail.com>
-Michael Geary <mike@geary.com>
-Stefan Petre <stefan.petre@gmail.com>
-Yehuda Katz <wycats@gmail.com>
-Corey Jewett <cj@syntheticplayground.com>
-Klaus Hartl <klaus.hartl@googlemail.com>
-Franck Marcia <franck.marcia@gmail.com>
-Jörn Zaefferer <joern.zaefferer@gmail.com>
-Paul Bakaus <paul.bakaus@googlemail.com>
-Brandon Aaron <brandon.aaron@gmail.com>
-Mike Alsup <malsup@gmail.com>
-Dave Methvin <dave.methvin@gmail.com>
-Ed Engelhardt <edengelhardt@gmail.com>
-Sean Catchpole <littlecooldude@gmail.com>
-Paul Mclanahan <pmclanahan@gmail.com>
-David Serduke <davidserduke@gmail.com>
-Richard D. Worth <rdworth@gmail.com>
-Scott González <scott.gonzalez@gmail.com>
-Ariel Flesler <aflesler@gmail.com>
-Jon Evans <jon@springyweb.com>
-TJ Holowaychuk <tj@vision-media.ca>
-Michael Bensoussan <mickey@seesmic.com>
-Robert Katić <robert.katic@gmail.com>
-Louis-Rémi Babé <lrbabe@gmail.com>
-Earle Castledine <mrspeaker@gmail.com>
-Damian Janowski <damian.janowski@gmail.com>
-Rich Dougherty <rich@rd.gen.nz>
-Kim Dalsgaard <kim@kimdalsgaard.com>
-Andrea Giammarchi <andrea.giammarchi@gmail.com>
-Mark Gibson <jollytoad@gmail.com>
-Karl Swedberg <kswedberg@gmail.com>
-Justin Meyer <justinbmeyer@gmail.com>
-Ben Alman <cowboy@rj3.net>
-James Padolsey <cla@padolsey.net>
-David Petersen <public@petersendidit.com>
-Batiste Bieler <batiste.bieler@gmail.com>
-Alexander Farkas <info@corrupt-system.de>
-Rick Waldron <waldron.rick@gmail.com>
-Filipe Fortes <filipe@fortes.com>
-Neeraj Singh <neerajdotname@gmail.com>
-Paul Irish <paul.irish@gmail.com>
-Iraê Carvalho <irae@irae.pro.br>
-Matt Curry <matt@pseudocoder.com>
-Michael Monteleone <michael@michaelmonteleone.net>
-Noah Sloan <noah.sloan@gmail.com>
-Tom Viner <github@viner.tv>
-Douglas Neiner <doug@pixelgraphics.us>
-Adam J. Sontag <ajpiano@ajpiano.com>
-Dave Reed <dareed@microsoft.com>
-Ralph Whitbeck <ralph.whitbeck@gmail.com>
-Carl Fürstenberg <azatoth@gmail.com>
-Jacob Wright <jacwright@gmail.com>
-J. Ryan Stinnett <jryans@gmail.com>
-unknown <Igen005@.upcorp.ad.uprr.com>
-temp01 <temp01irc@gmail.com>
-Heungsub Lee <h@subl.ee>
-Colin Snover <colin@alpha.zetafleet.com>
-Ryan W Tenney <ryan@10e.us>
-Pinhook <contact@pinhooklabs.com>
-Ron Otten <r.j.g.otten@gmail.com>
-Jephte Clain <Jephte.Clain@univ-reunion.fr>
-Anton Matzneller <obhvsbypqghgc@gmail.com>
-Alex Sexton <AlexSexton@gmail.com>
-Dan Heberden <danheberden@gmail.com>
-Henri Wiechers <hwiechers@gmail.com>
-Russell Holbrook <russell.holbrook@patch.com>
-Julian Aubourg <aubourg.julian@gmail.com>
-Gianni Alessandro Chiappetta <gianni@runlevel6.org>
-Scott Jehl <scott@scottjehl.com>
-James Burke <jrburke@gmail.com>
-Jonas Pfenniger <jonas@pfenniger.name>
-Xavi Ramirez <xavi.rmz@gmail.com>
-Jared Grippe <jared@deadlyicon.com>
-Sylvester Keil <sylvester@keil.or.at>
-Brandon Sterne <bsterne@mozilla.com>
-Mathias Bynens <mathias@qiwi.be>
-Timmy Willison <timmywillisn@gmail.com>
-Corey Frang <gnarf@gnarf.net>
-Digitalxero <digitalxero>
-Anton Kovalyov <anton@kovalyov.net>
-David Murdoch <musicisair@yahoo.com>
-Josh Varner <josh.varner@gmail.com>
-Charles McNulty <cmcnulty@kznf.com>
-Jordan Boesch <jboesch26@gmail.com>
-Jess Thrysoee <jess@thrysoee.dk>
-Michael Murray <m@murz.net>
-Lee Carpenter <elcarpie@gmail.com>
-Alexis Abril <me@alexisabril.com>
-Rob Morgan <robbym@gmail.com>
-John Firebaugh <john_firebaugh@bigfix.com>
-Sam Bisbee <sam@sbisbee.com>
-Gilmore Davidson <gilmoreorless@gmail.com>
-Brian Brennan <me@brianlovesthings.com>
-Xavier Montillet <xavierm02.net@gmail.com>
-Daniel Pihlstrom <sciolist.se@gmail.com>
-Sahab Yazdani <sahab.yazdani+github@gmail.com>
-avaly <github-com@agachi.name>
-Scott Hughes <hi@scott-hughes.me>
-Mike Sherov <mike.sherov@gmail.com>
-Greg Hazel <ghazel@gmail.com>
-Schalk Neethling <schalk@ossreleasefeed.com>
-Denis Knauf <Denis.Knauf@gmail.com>
-Timo Tijhof <krinklemail@gmail.com>
-Steen Nielsen <swinedk@gmail.com>
-Anton Ryzhov <anton@ryzhov.me>
-Shi Chuan <shichuanr@gmail.com>
-Berker Peksag <berker.peksag@gmail.com>
-Toby Brain <tobyb@freshview.com>
-Matt Mueller <mattmuelle@gmail.com>
-Justin <drakefjustin@gmail.com>
-Daniel Herman <daniel.c.herman@gmail.com>
-Oleg Gaidarenko <markelog@gmail.com>
-Richard Gibson <richard.gibson@gmail.com>
-Rafaël Blais Masson <rafbmasson@gmail.com>
-cmc3cn <59194618@qq.com>
-Joe Presbrey <presbrey@gmail.com>
-Sindre Sorhus <sindresorhus@gmail.com>
-Arne de Bree <arne@bukkie.nl>
-Vladislav Zarakovsky <vlad.zar@gmail.com>
-Andrew E Monat <amonat@gmail.com>
-Oskari <admin@o-programs.com>
-Joao Henrique de Andrade Bruni <joaohbruni@yahoo.com.br>
-tsinha <tsinha@Anthonys-MacBook-Pro.local>
-Matt Farmer <matt@frmr.me>
-Trey Hunner <treyhunner@gmail.com>
-Jason Moon <jmoon@socialcast.com>
-Jeffery To <jeffery.to@gmail.com>
-Kris Borchers <kris.borchers@gmail.com>
-Vladimir Zhuravlev <private.face@gmail.com>
-Jacob Thornton <jacobthornton@gmail.com>
-Chad Killingsworth <chadkillingsworth@missouristate.edu>
-Nowres Rafid <nowres.rafed@gmail.com>
-David Benjamin <davidben@mit.edu>
-Uri Gilad <antishok@gmail.com>
-Chris Faulkner <thefaulkner@gmail.com>
-Elijah Manor <elijah.manor@gmail.com>
-Daniel Chatfield <chatfielddaniel@gmail.com>
-Nikita Govorov <nikita.govorov@gmail.com>
-Wesley Walser <wwalser@atlassian.com>
-Mike Pennisi <mike@mikepennisi.com>
-Markus Staab <markus.staab@redaxo.de>
-Dave Riddle <david@joyvuu.com>
-Callum Macrae <callum@lynxphp.com>
-Benjamin Truyman <bentruyman@gmail.com>
-James Huston <james@jameshuston.net>
-Erick Ruiz de Chávez <erickrdch@gmail.com>
-David Bonner <dbonner@cogolabs.com>
-Akintayo Akinwunmi <aakinwunmi@judge.com>
-MORGAN <morgan@morgangraphics.com>
-Ismail Khair <ismail.khair@gmail.com>
-Carl Danley <carldanley@gmail.com>
-Mike Petrovich <michael.c.petrovich@gmail.com>
-Greg Lavallee <greglavallee@wapolabs.com>
-Daniel Gálvez <dgalvez@editablething.com>
-Sai Lung Wong <sai.wong@huffingtonpost.com>
-Tom H Fuertes <TomFuertes@gmail.com>
-Roland Eckl <eckl.roland@googlemail.com>
-Jay Merrifield <fracmak@gmail.com>
-Allen J Schmidt Jr <cobrasoft@gmail.com>
-Jonathan Sampson <jjdsampson@gmail.com>
-Marcel Greter <marcel.greter@ocbnet.ch>
-Matthias Jäggli <matthias.jaeggli@gmail.com>
-David Fox <dfoxinator@gmail.com>
-Yiming He <yiminghe@gmail.com>
-Devin Cooper <cooper.semantics@gmail.com>
-Paul Ramos <paul.b.ramos@gmail.com>
-Rod Vagg <rod@vagg.org>
-Bennett Sorbo <bsorbo@gmail.com>
-Sebastian Burkhard <sebi.burkhard@gmail.com>
-nanto <nanto@moon.email.ne.jp>
-Danil Somsikov <danilasomsikov@gmail.com>
-Ryunosuke SATO <tricknotes.rs@gmail.com>
-Jean Boussier <jean.boussier@gmail.com>
-Adam Coulombe <me@adam.co>
-Andrew Plummer <plummer.andrew@gmail.com>
-Mark Raddatz <mraddatz@gmail.com>
-Dmitry Gusev <dmitry.gusev@gmail.com>
-Michał Gołębiowski <m.goleb@gmail.com>
-Nguyen Phuc Lam <ruado1987@gmail.com>
-Tom H Fuertes <tomfuertes@gmail.com>
-Brandon Johnson <bjohn465+github@gmail.com>
-Jason Bedard <jason+jquery@jbedard.ca>
-Kyle Robinson Young <kyle@dontkry.com>
-Renato Oliveira dos Santos <ros3@cin.ufpe.br>
-Chris Talkington <chris@talkingtontech.com>
-Eddie Monge <eddie@eddiemonge.com>
-Terry Jones <terry@jon.es>
-Jason Merino <jasonmerino@gmail.com>
-Jeremy Dunck <jdunck@gmail.com>
-Chris Price <price.c@gmail.com>
-Amey Sakhadeo <me@ameyms.com>
-Anthony Ryan <anthonyryan1@gmail.com>
-Dominik D. Geyer <dominik.geyer@gmail.com>
-George Kats <katsgeorgeek@gmail.com>
-Lihan Li <frankieteardrop@gmail.com>
-Ronny Springer <springer.ronny@gmail.com>
-Marian Sollmann <marian.sollmann@cargomedia.ch>
-Corey Frang <gnarf37@gmail.com>
-Chris Antaki <ChrisAntaki@gmail.com>
-Noah Hamann <njhamann@gmail.com>
-David Hong <d.hong@me.com>
-Jakob Stoeck <jakob@pokermania.de>
-Christopher Jones <christopherjonesqed@gmail.com>
-Forbes Lindesay <forbes@lindesay.co.uk>
-John Paul <john@johnkpaul.com>
-S. Andrew Sheppard <andrew@wq.io>
-Leonardo Balter <leonardo.balter@gmail.com>
-Roman Reiß <me@silverwind.io>
-Benjy Cui <benjytrys@gmail.com>
-Rodrigo Rosenfeld Rosas <rr.rosas@gmail.com>
-John Hoven <hovenj@gmail.com>
-Christian Kosmowski <ksmwsk@gmail.com>
-Liang Peng <poppinlp@gmail.com>
-TJ VanToll <tj.vantoll@gmail.com>
-Senya Pugach <upisfree@outlook.com>
-Aurelio De Rosa <aurelioderosa@gmail.com>
-Nazar Mokrynskyi <nazar@mokrynskyi.com>
-Arthur Verschaeve <contact@arthurverschaeve.be>
-Dan Hart <danhart@notonthehighstreet.com>
-Scott González <scott.gonzalez@gmail.com>
-Zheming Sun <mescodasun@gmail.com>
-Bin Xin <rhyzix@gmail.com>
-David Corbacho <davidcorbacho@gmail.com>
-Veaceslav Grimalschi <grimalschi@yandex.ru>
-Daniel Husar <dano.husar@gmail.com>
-Jason Bedard <jason+github@jbedard.ca>
-Ben Toews <mastahyeti@gmail.com>
-Aditya Raghavan <araghavan3@gmail.com>
-Nicolas HENRY <icewil@gmail.com>
-Norman Xu <homyu.shinn@gmail.com>
-Anne-Gaelle Colom <coloma@westminster.ac.uk>
-Victor Homyakov <vkhomyackov@gmail.com>
-George Mauer <gmauer@gmail.com>
-Leonardo Braga <leonardo.braga@gmail.com>
-Stephen Edgar <stephen@netweb.com.au>
-Thomas Tortorini <thomastortorini@gmail.com>
-Winston Howes <winstonhowes@gmail.com>
-Jon Hester <jon.d.hester@gmail.com>
-Alexander O'Mara <me@alexomara.com>
-Bastian Buchholz <buchholz.bastian@googlemail.com>
-Arthur Stolyar <nekr.fabula@gmail.com>
-Calvin Metcalf <calvin.metcalf@gmail.com>
-Mu Haibao <mhbseal@163.com>
-Richard McDaniel <rm0026@uah.edu>
-Chris Rebert <github@rebertia.com>
-Gilad Peleg <giladp007@gmail.com>
-Martin Naumann <martin@geekonaut.de>
-Bruno Pérel <brunoperel@gmail.com>
-Reed Loden <reed@reedloden.com>
-Daniel Nill <daniellnill@gmail.com>
-Yongwoo Jeon <yongwoo.jeon@navercorp.com>
-Sean Henderson <seanh.za@gmail.com>
-Adrian Olek <adrianolek@gmail.com>
-Richard Kraaijenhagen <stdin+git@riichard.com>
-Gary Ye <garysye@gmail.com>
-Christian Grete <webmaster@christiangrete.com>
-Liza Ramo <liza.h.ramo@gmail.com>
-Joelle Fleurantin <joasqueeniebee@gmail.com>
-Julian Alexander Murillo <julian.alexander.murillo@gmail.com>
-Jun Sun <klsforever@gmail.com>
-Devin Wilson <dwilson6.github@gmail.com>
-Todor Prikumov <tono_pr@abv.bg>
-Zack Hall <zackhall@outlook.com>
--- a/inst/www/shared/legacy/jquery.js
+++ b/inst/www/shared/legacy/jquery.js
--- a/inst/www/shared/legacy/jquery.min.js
+++ b/inst/www/shared/legacy/jquery.min.js
--- a/inst/www/shared/legacy/jquery.min.map
+++ b/inst/www/shared/legacy/jquery.min.map
--- a/inst/www/shared/shiny-showcase.js
+++ b/inst/www/shared/shiny-showcase.js
@@ -83,8 +83,6 @@
      el.id = "srcref_" + srcref;
      var ref = srcref;
      var code = document.getElementById(srcfile.replace(/\./g, "_") + "_code");
-      // if there is no code file (might be a shiny file), quit early
-      if (!code) return;
      var start = findTextPoint(code, ref[0], ref[4]);
      var end = findTextPoint(code, ref[2], ref[5]);

@@ -150,8 +148,6 @@
      }
    }

-    // hide the new element before doing anything to it
-    $(newHostElement).hide();
    $(currentHostElement).fadeOut(animateCodeMs, function() {
      var tabs = document.getElementById("showcase-code-tabs");
      currentHostElement.removeChild(tabs);
@@ -164,7 +160,7 @@
        document.getElementById("showcase-code-content").removeAttribute("style");
      }

-      $(newHostElement).fadeIn(animateCodeMs);
+      $(newHostElement).fadeIn();
      if (!above) {
        // remove the applied width and zoom on the app container, and
        // scroll smoothly down to the code's new home
@@ -193,6 +189,7 @@
    if (above) {
      $(document.body).animate({ scrollTop: 0 }, animateCodeMs);
    }
+    $(newHostElement).hide();
    isCodeAbove = above;
    setAppCodeSxsWidths(above && animate);
    $(window).trigger("resize");
--- a/inst/www/shared/shiny.js
+++ b/inst/www/shared/shiny.js
@@ -12,7 +12,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope

  var exports = window.Shiny = window.Shiny || {};

-  exports.version = "1.4.0.1"; // Version number inserted by Grunt
+  exports.version = "1.3.2.9001"; // Version number inserted by Grunt

  var origPushState = window.history.pushState;
  window.history.pushState = function () {
@@ -611,7 +611,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
        return;
      }
      this.lastSentValues[inputName] = { jsonValue: jsonValue, inputType: inputType };
-      this.target.setInput(nameType, value, opts);
+      this.target.setInput(name, value, opts);
    };
    this.reset = function () {
      var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -626,10 +626,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
      for (var inputName in values) {
        if (values.hasOwnProperty(inputName)) {
          var _splitInputNameType2 = splitInputNameType(inputName),
-              name = _splitInputNameType2.name,
+              _name = _splitInputNameType2.name,
              inputType = _splitInputNameType2.inputType;

-          cacheValues[name] = {
+          cacheValues[_name] = {
            jsonValue: JSON.stringify(values[inputName]),
            inputType: inputType
          };
@@ -658,7 +658,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
      $(opts.el).trigger(evt);

      if (!evt.isDefaultPrevented()) {
-        var name = evt.name;
+        name = evt.name;
        if (evt.inputType !== '') name += ':' + evt.inputType;

        // Most opts aren't passed along to lower levels in the input decorator
@@ -713,16 +713,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  };
  (function () {
    this.setInput = function (nameType, value, opts) {
-      if (/^\./.test(nameType)) this.target.setInput(nameType, value, opts);else this.pendingInput[nameType] = { value: value, opts: opts };
+      if (/^\./.test(nameType)) this.target.setInput(nameType, value, opts);else this.pendingInput[name] = { value: value, opts: opts };
    };
    this.submit = function () {
-      for (var nameType in this.pendingInput) {
-        if (this.pendingInput.hasOwnProperty(nameType)) {
-          var _pendingInput$nameTyp = this.pendingInput[nameType],
-              value = _pendingInput$nameTyp.value,
-              opts = _pendingInput$nameTyp.opts;
-
-          this.target.setInput(nameType, value, opts);
+      for (var name in this.pendingInput) {
+        if (this.pendingInput.hasOwnProperty(name)) {
+          var input = this.pendingInput[name];
+          this.target.setInput(name, input.value, input.opts);
        }
      }
    };
@@ -3002,7 +2999,9 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
      var e2 = $.Event(newEventType, {
        which: e.which,
        pageX: e.pageX,
-        pageY: e.pageY
+        pageY: e.pageY,
+        offsetX: e.offsetX,
+        offsetY: e.offsetY
      });

      $el.trigger(e2);
@@ -3049,7 +3048,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
        // If second click is too far away, it doesn't count as a double
        // click. Instead, immediately trigger a mousedown2 for the previous
        // click, and set this click as a new first click.
-        if (pending_e && Math.abs(pending_e.pageX - e.pageX) > 2 || Math.abs(pending_e.pageY - e.pageY) > 2) {
+        if (pending_e && Math.abs(pending_e.offsetX - e.offsetX) > 2 || Math.abs(pending_e.offsetY - e.offsetY) > 2) {

          triggerPendingMousedown2();
          scheduleMousedown2(e);
@@ -6594,7 +6593,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
    initialValues['.clientdata_url_hash'] = window.location.hash;

    $(window).on('hashchange', function (e) {
-      inputs.setInput('.clientdata_url_hash', window.location.hash);
+      inputs.setInput('.clientdata_url_hash', location.hash);
    });

    // The server needs to know what singletons were rendered as part of
@@ -6660,16 +6659,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  });

  $(document).on('keydown', function (e) {
-    if (
-    // if not one of the key combos below
-    !(
-    // cmd/ctrl + fn + f4
-    e.which === 115 && (e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey ||
-    // cmd/ctrl + shift + fn + f3
-    e.which === 114 && (e.ctrlKey || e.metaKey) && e.shiftKey && !e.altKey)) {
-      return;
-    }
-
+    if (e.which !== 115 || !e.ctrlKey && !e.metaKey || e.shiftKey || e.altKey) return;
    var url = 'reactlog/mark?w=' + window.escape(exports.shinyapp.config.workerId) + "&s=" + window.escape(exports.shinyapp.config.sessionId);

    // send notification
@@ -6682,9 +6672,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
        html: html,
        closeButton: true
      });
-    }).fail(function () {
-      // found returned error while marking, should open webpage
-      window.open(url);
    });

    e.preventDefault();
--- 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/actionButton.Rd
+++ b/man/actionButton.Rd
@@ -26,17 +26,6 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 Creates an action button or link whose value is initially zero, and increments by one
 each time it is pressed.
 }
-\section{Server value}{
-
-An integer of class \code{"shinyActionButtonValue"}. This class differs from
-ordinary integers in that a value of 0 is considered "falsy".
-This implies two things:
-\itemize{
-\item Event handlers (e.g., \code{\link[=observeEvent]{observeEvent()}}, \code{\link[=eventReactive]{eventReactive()}}) won't execute on initial load.
-\item Input validation (e.g., \code{\link[=req]{req()}}, \code{\link[=need]{need()}}) will fail on initial load.
-}
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
--- a/man/bootstrapPage.Rd
+++ b/man/bootstrapPage.Rd
@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/bootstrap.R
+% Please edit documentation in R/bootstrap-deprecated.R
 \name{bootstrapPage}
 \alias{bootstrapPage}
 \alias{basicPage}
@@ -24,20 +24,9 @@ www directory, e.g. \code{www/bootstrap.css})}
 A UI defintion that can be passed to the \link{shinyUI} function.
 }
 \description{
-Create a Shiny UI page that loads the CSS and JavaScript for
-\href{http://getbootstrap.com/}{Bootstrap}, and has no content in the page
-body (other than what you provide).
-}
-\details{
-This function is primarily intended for users who are proficient in HTML/CSS,
-and know how to lay out pages in Bootstrap. Most applications should use
-\code{\link[=fluidPage]{fluidPage()}} along with layout functions like
-\code{\link[=fluidRow]{fluidRow()}} and \code{\link[=sidebarLayout]{sidebarLayout()}}.
-}
-\note{
-The \code{basicPage} function is deprecated, you should use the
-\code{\link[=fluidPage]{fluidPage()}} function instead.
+\strong{DEPRECATED}: use \code{\link[=fluidPage]{fluidPage()}} instead.
 }
 \seealso{
 \code{\link[=fluidPage]{fluidPage()}}, \code{\link[=fixedPage]{fixedPage()}}
 }
+\keyword{internal}
--- a/man/checkboxGroupInput.Rd
+++ b/man/checkboxGroupInput.Rd
@@ -44,11 +44,6 @@ Create a group of checkboxes that can be used to toggle multiple choices
 independently. The server will receive the input as a character vector of the
 selected values.
 }
-\section{Server value}{
-
-Character vector of values corresponding to the boxes that are checked.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
--- a/man/checkboxInput.Rd
+++ b/man/checkboxInput.Rd
@@ -22,11 +22,6 @@ A checkbox control that can be added to a UI definition.
 \description{
 Create a checkbox that can be used to specify logical values.
 }
-\section{Server value}{
-
-\code{TRUE} if checked, \code{FALSE} otherwise.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -40,7 +35,6 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=checkboxGroupInput]{checkboxGroupInput()}}, \code{\link[=updateCheckboxInput]{updateCheckboxInput()}}
--- a/man/dateInput.Rd
+++ b/man/dateInput.Rd
@@ -75,11 +75,6 @@ the browser. It allows the following values:
 \item \code{DD} Full weekday name
 }
 }
-\section{Server value}{
-
-A \link{Date} vector of length 1.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -115,7 +110,6 @@ ui <- fluidPage(

 shinyApp(ui, server = function(input, output) { })
 }
-
 }
 \seealso{
 \code{\link[=dateRangeInput]{dateRangeInput()}}, \code{\link[=updateDateInput]{updateDateInput()}}
--- a/man/dateRangeInput.Rd
+++ b/man/dateRangeInput.Rd
@@ -75,11 +75,6 @@ the browser. It allows the following values:
 \item \code{DD} Full weekday name
 }
 }
-\section{Server value}{
-
-A \link{Date} vector of length 2.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -119,7 +114,6 @@ ui <- fluidPage(

 shinyApp(ui, server = function(input, output) { })
 }
-
 }
 \seealso{
 \code{\link[=dateInput]{dateInput()}}, \code{\link[=updateDateRangeInput]{updateDateRangeInput()}}
--- a/man/fileInput.Rd
+++ b/man/fileInput.Rd
@@ -33,11 +33,8 @@ Create a file upload control that can be used to upload one or more files.
 }
 \details{
 Whenever a file upload completes, the corresponding input variable is set
-to a dataframe. See the \code{Server value} section.
-}
-\section{Server value}{
-
-A \code{data.frame} that contains one row for each selected file, and following columns:
+to a dataframe. This dataframe contains one row for each selected file, and
+the following columns:
 \describe{
 \item{\code{name}}{The filename provided by the web browser. This is
 \strong{not} the path to read to get at the actual data that was uploaded
@@ -52,7 +49,6 @@ uploaded. This file may be deleted if the user performs another upload
 operation.}
 }
 }
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -93,7 +89,6 @@ server <- function(input, output) {

 shinyApp(ui, server)
 }
-
 }
 \seealso{
 Other input elements: \code{\link{actionButton}},
--- a/man/fillPage.Rd
+++ b/man/fillPage.Rd
@@ -82,10 +82,3 @@ fillPage(
  )
 )
 }
-\seealso{
-Other layout functions: \code{\link{fixedPage}},
-  \code{\link{flowLayout}}, \code{\link{fluidPage}},
-  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
-}
-\concept{layout functions}
--- a/man/fixedPage.Rd
+++ b/man/fixedPage.Rd
@@ -66,10 +66,4 @@ shinyApp(ui, server = function(input, output) { })
 }
 \seealso{
 \code{\link[=column]{column()}}
-
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{flowLayout}}, \code{\link{fluidPage}},
-  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
-\concept{layout functions}
--- a/man/flowLayout.Rd
+++ b/man/flowLayout.Rd
@@ -32,9 +32,5 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{fluidPage}},
-  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
+\code{\link[=verticalLayout]{verticalLayout()}}
 }
-\concept{layout functions}
--- a/man/fluidPage.Rd
+++ b/man/fluidPage.Rd
@@ -99,11 +99,5 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-\code{\link[=column]{column()}}
-
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{flowLayout}},
-  \code{\link{navbarPage}}, \code{\link{sidebarLayout}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
+\code{\link[=column]{column()}}, \code{\link[=sidebarLayout]{sidebarLayout()}}
 }
-\concept{layout functions}
--- a/man/navbarPage.Rd
+++ b/man/navbarPage.Rd
@@ -105,10 +105,4 @@ navbarPage("App Title",
 \code{\link[=tabPanel]{tabPanel()}}, \code{\link[=tabsetPanel]{tabsetPanel()}},
 \code{\link[=updateNavbarPage]{updateNavbarPage()}}, \code{\link[=insertTab]{insertTab()}},
 \code{\link[=showTab]{showTab()}}
-
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{flowLayout}},
-  \code{\link{fluidPage}}, \code{\link{sidebarLayout}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
 }
-\concept{layout functions}
--- a/man/numericInput.Rd
+++ b/man/numericInput.Rd
@@ -29,11 +29,6 @@ A numeric input control that can be added to a UI definition.
 \description{
 Create an input control for entry of numeric values
 }
-\section{Server value}{
-
-A numeric vector of length 1.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -47,7 +42,6 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=updateNumericInput]{updateNumericInput()}}
--- a/man/passwordInput.Rd
+++ b/man/passwordInput.Rd
@@ -27,12 +27,6 @@ A text input control that can be added to a UI definition.
 \description{
 Create an password control for entry of passwords.
 }
-\section{Server value}{
-
-A character string of the password input. The default value is \code{""}
-unless \code{value} is provided.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
--- a/man/radioButtons.Rd
+++ b/man/radioButtons.Rd
@@ -49,11 +49,6 @@ the radio buttons to have no options selected by using \code{selected = characte
 to return to that state once they've made a selection. Instead, consider
 having the first of your choices be \code{c("None selected" = "")}.
 }
-\section{Server value}{
-
-A character string containing the value of the selected button.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -103,7 +98,6 @@ server <- function(input, output) {

 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=updateRadioButtons]{updateRadioButtons()}}
--- a/man/selectInput.Rd
+++ b/man/selectInput.Rd
@@ -18,13 +18,14 @@ selectizeInput(inputId, ..., options = NULL, width = NULL)
 \item{choices}{List of values to select from. If elements of the list are
 named, then that name --- rather than the value --- is displayed to the
 user. It's also possible to group related inputs by providing a named list
-whose elements are (either named or unnamed) lists, vectors, or factors. In
-this case, the outermost names will be used as the group labels (leveraging
-the \code{<optgroup>} HTML tag) for the elements in the respective sublist. See
-the example section for a small demo of this feature.}
+whose elements are (either named or unnamed) lists, vectors, or factors. In this
+case, the outermost names will be used as the group labels (leveraging the
+\code{<optgroup>} HTML tag) for the elements in the respective sublist. See the
+example section for a small demo of this feature.}

-\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
-single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if
+\code{multiple = TRUE}). If not specified then defaults to the first value
+for single-select lists and no values for multiple select lists.}

 \item{multiple}{Is selection of multiple items allowed?}

@@ -35,8 +36,8 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}

 \item{size}{Number of items to show in the selection box; a larger number
 will result in a taller box. Not compatible with \code{selectize=TRUE}.
-Normally, when \code{multiple=FALSE}, a select input will be a drop-down list,
-but when \code{size} is set, it will be a box instead.}
+Normally, when \code{multiple=FALSE}, a select input will be a drop-down
+list, but when \code{size} is set, it will be a box instead.}

 \item{...}{Arguments passed to \code{selectInput()}.}

@@ -53,13 +54,14 @@ Create a select list that can be used to choose a single or multiple items
 from a list of values.
 }
 \details{
-By default, \code{selectInput()} and \code{selectizeInput()} use the JavaScript library
-\pkg{selectize.js} (\url{https://github.com/selectize/selectize.js}) instead of
-the basic select input element. To use the standard HTML select input
-element, use \code{selectInput()} with \code{selectize=FALSE}.
+By default, \code{selectInput()} and \code{selectizeInput()} use the
+JavaScript library \pkg{selectize.js}
+(\url{https://github.com/selectize/selectize.js}) instead of the basic
+select input element. To use the standard HTML select input element, use
+\code{selectInput()} with \code{selectize=FALSE}.

-In selectize mode, if the first element in \code{choices} has a value of \code{""}, its
-name will be treated as a placeholder prompt. For example:
+In selectize mode, if the first element in \code{choices} has a value of
+\code{""}, its name will be treated as a placeholder prompt. For example:
 \code{selectInput("letter", "Letter", c("Choose one" = "", LETTERS))}
 }
 \note{
@@ -72,12 +74,6 @@ value when it is a single choice input and the empty string is not in the
 \code{choices} argument. This is to keep compatibility with
 \code{selectInput(..., selectize = FALSE)}.
 }
-\section{Server value}{
- A vector of character strings, usually of length
-1, with the value of the selected items. When \code{multiple=TRUE} and
-nothing is selected, this value will be \code{NULL}.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -115,7 +111,6 @@ shinyApp(
  }
 )
 }
-
 }
 \seealso{
 \code{\link[=updateSelectInput]{updateSelectInput()}} \code{\link[=varSelectInput]{varSelectInput()}}
--- a/man/shinyOptions.Rd
+++ b/man/shinyOptions.Rd
@@ -40,7 +40,7 @@ be set globally with \code{options()} or locally (for a single app) with
 \code{shinyOptions()}.

 \describe{
-\item{shiny.autoreload (defaults to \code{FALSE})}{If \code{TRUE} when a Shiny app is launched, the
+\item{shiny.autoreload}{If \code{TRUE} when a Shiny app is launched, the
 app directory will be continually monitored for changes to files that
 have the extensions: r, htm, html, js, css, png, jpg, jpeg, gif. If any
 changes are detected, all connected Shiny sessions are reloaded. This
@@ -56,63 +56,62 @@ by setting e.g. `options(shiny.autoreload.interval = 2000)` (every
 two seconds).}
 }

-\item{shiny.deprecation.messages (defaults to \code{TRUE})}{This controls whether messages for
+\item{shiny.deprecation.messages}{This controls whether messages for
 deprecated functions in Shiny will be printed. See
 \code{\link[=shinyDeprecated]{shinyDeprecated()}} for more information.}
-\item{shiny.error (defaults to \code{NULL})}{This can be a function which is called when an error
+\item{shiny.error}{This can be a function which is called when an error
 occurs. For example, \code{options(shiny.error=recover)} will result a
 the debugger prompt when an error occurs.}
-\item{shiny.fullstacktrace (defaults to \code{FALSE})}{Controls whether "pretty" (\code{FALSE}) or full
-stack traces (\code{TRUE}) are dumped to the console when errors occur during Shiny app execution.
-Pretty stack traces attempt to only show user-supplied code, but this pruning can't always
-be done 100\% correctly.}
-\item{shiny.host (defaults to \code{"127.0.0.1"})}{The IP address that Shiny should listen on. See
+\item{shiny.fullstacktrace}{Controls whether "pretty" or full stack traces
+are dumped to the console when errors occur during Shiny app execution.
+The default is \code{FALSE} (pretty stack traces).}
+\item{shiny.host}{The IP address that Shiny should listen on. See
 \code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.jquery.version (defaults to \code{3})}{The major version of jQuery to use.
-Currently only values of \code{3} or \code{1} are supported. If \code{1}, then jQuery 1.12.4 is used. If \code{3},
-then jQuery 3.4.1 is used.}
-\item{shiny.json.digits (defaults to \code{16})}{The number of digits to use when converting
+\item{shiny.json.digits}{The number of digits to use when converting
 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
+\item{shiny.launch.browser}{A boolean which controls the default behavior
 when an app is run. See \code{\link[=runApp]{runApp()}} for more information.}
-\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
-Whether or not to include Shiny's JavaScript as a minified (\code{shiny.min.js})
-or un-minified (\code{shiny.js}) file. The un-minified version is larger,
-but can be helpful for development and debugging.}
-\item{shiny.port (defaults to a random open port)}{A port number that Shiny will listen on. See
+\item{shiny.maxRequestSize}{This is a number which specifies the maximum
+web request size, which serves as a size limit for file uploads. If
+unset, the maximum request size defaults to 5MB.}
+\item{shiny.minified}{If this is \code{TRUE} or unset (the default), then
+Shiny will use minified JavaScript (\code{shiny.min.js}). If
+\code{FALSE}, then Shiny will use the un-minified JavaScript
+(\code{shiny.js}); this can be useful during development.}
+\item{shiny.port}{A port number that Shiny will listen on. See
 \code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.reactlog (defaults to \code{FALSE})}{If \code{TRUE}, enable logging of reactive events,
+\item{shiny.reactlog}{If \code{TRUE}, enable logging of reactive events,
 which can be viewed later with the \code{\link[=reactlogShow]{reactlogShow()}} function.
 This incurs a substantial performance penalty and should not be used in
 production.}
-\item{shiny.sanitize.errors (defaults to \code{FALSE})}{If \code{TRUE}, then normal errors (i.e.
+\item{shiny.sanitize.errors}{If \code{TRUE}, then normal errors (i.e.
 errors not wrapped in \code{safeError}) won't show up in the app; a simple
 generic error message is printed instead (the error and strack trace printed
-to the console remain unchanged). If you want to sanitize errors in general, but you DO want a
+to the console remain unchanged). The default is \code{FALSE} (unsanitized
+errors).If you want to sanitize errors in general, but you DO want a
 particular error \code{e} to get displayed to the user, then set this option
 to \code{TRUE} and use \code{stop(safeError(e))} for errors you want the
 user to see.}
-\item{shiny.stacktraceoffset (defaults to \code{TRUE})}{If \code{TRUE}, then Shiny's printed stack
+\item{shiny.stacktraceoffset}{If \code{TRUE}, then Shiny's printed stack
 traces will display srcrefs one line above their usual location. This is
 an arguably more intuitive arrangement for casual R users, as the name
 of a function appears next to the srcref where it is defined, rather than
 where it is currently being called from.}
-\item{shiny.suppressMissingContextError (defaults to \code{FALSE})}{Normally, invoking a reactive
+\item{shiny.suppressMissingContextError}{Normally, invoking a reactive
 outside of a reactive context (or \code{\link[=isolate]{isolate()}}) results in
 an error. If this is \code{TRUE}, don't error in these cases. This
 should only be used for debugging or demonstrations of reactivity at the
 console.}
-\item{shiny.testmode (defaults to \code{FALSE})}{If \code{TRUE}, then various features for testing Shiny
-applications are enabled.}
-\item{shiny.trace (defaults to \code{FALSE})}{Print messages sent between the R server and the web
+\item{shiny.table.class}{CSS class names to use for tables.}
+\item{shiny.testmode}{If \code{TRUE}, then enable features for testing Shiny
+applications. If \code{FALSE} (the default), do not enable those features.}
+\item{shiny.trace}{Print messages sent between the R server and the web
 browser client to the R console. This is useful for debugging. Possible
 values are \code{"send"} (only print messages sent to the client),
 \code{"recv"} (only print messages received by the server), \code{TRUE}
 (print all messages), or \code{FALSE} (default; don't print any of these
 messages).}
-\item{shiny.usecairo (defaults to \code{TRUE})}{This is used to disable graphical rendering by the
+\item{shiny.usecairo}{This is used to disable graphical rendering by the
 Cairo package, if it is installed. See \code{\link[=plotPNG]{plotPNG()}} for more
 information.}
 }
--- a/man/showNotification.Rd
+++ b/man/showNotification.Rd
@@ -9,7 +9,7 @@ showNotification(ui, action = NULL, duration = 5, closeButton = TRUE,
  id = NULL, type = c("default", "message", "warning", "error"),
  session = getDefaultReactiveDomain())

-removeNotification(id, session = getDefaultReactiveDomain())
+removeNotification(id = NULL, session = getDefaultReactiveDomain())
 }
 \arguments{
 \item{ui}{Content of message.}
@@ -26,13 +26,11 @@ disappear.}
 \item{closeButton}{If \code{TRUE}, display a button which will make the
 notification disappear when clicked. If \code{FALSE} do not display.}

-\item{id}{A unique identifier for the notification.
-
-\code{id} is optional for \code{showNotification()}: Shiny will automatically create
-one if needed. If you do supply it, Shiny will update an existing
-notification if it exists, otherwise it will create a new one.
-
-\code{id} is required for \code{removeNotification()}.}
+\item{id}{An ID string. This can be used to change the contents of an
+existing message with \code{showNotification}, or to remove it with
+\code{removeNotification}. If not provided, one will be generated
+automatically. If an ID is provided and there does not currently exist a
+notification with that ID, a new notification will be created with that ID.}

 \item{type}{A string which controls the color of the notification. One of
 "default" (gray), "message" (blue), "warning" (yellow), or "error" (red).}
--- a/man/sidebarLayout.Rd
+++ b/man/sidebarLayout.Rd
@@ -76,10 +76,3 @@ server <- function(input, output) {
 shinyApp(ui, server)
 }
 }
-\seealso{
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{flowLayout}},
-  \code{\link{fluidPage}}, \code{\link{navbarPage}},
-  \code{\link{splitLayout}}, \code{\link{verticalLayout}}
-}
-\concept{layout functions}
--- a/man/sliderInput.Rd
+++ b/man/sliderInput.Rd
@@ -93,11 +93,6 @@ or list of tags (using \code{\link[=tag]{tag()}} and friends), or raw HTML (usin
 \description{
 Constructs a slider widget to select a numeric value from a range.
 }
-\section{Server value}{
-
-A number, or in the case of slider range, a vector of two numbers.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -120,7 +115,6 @@ server <- function(input, output) {
 # Complete app with UI and server components
 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=updateSliderInput]{updateSliderInput()}}
--- a/man/splitLayout.Rd
+++ b/man/splitLayout.Rd
@@ -61,10 +61,3 @@ ui <- splitLayout(
 shinyApp(ui, server)
 }
 }
-\seealso{
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{flowLayout}},
-  \code{\link{fluidPage}}, \code{\link{navbarPage}},
-  \code{\link{sidebarLayout}}, \code{\link{verticalLayout}}
-}
-\concept{layout functions}
--- a/man/textAreaInput.Rd
+++ b/man/textAreaInput.Rd
@@ -45,12 +45,6 @@ A textarea input control that can be added to a UI definition.
 \description{
 Create a textarea input control for entry of unstructured text values.
 }
-\section{Server value}{
-
-A character string of the text input. The default value is \code{""}
-unless \code{value} is provided.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -65,7 +59,6 @@ server <- function(input, output) {
 shinyApp(ui, server)

 }
-
 }
 \seealso{
 \code{\link[=updateTextAreaInput]{updateTextAreaInput()}}
--- a/man/textInput.Rd
+++ b/man/textInput.Rd
@@ -27,12 +27,6 @@ A text input control that can be added to a UI definition.
 \description{
 Create an input control for entry of unstructured text values
 }
-\section{Server value}{
-
-A character string of the text input. The default value is \code{""}
-unless \code{value} is provided.
-}
-
 \examples{
 ## Only run examples in interactive R sessions
 if (interactive()) {
@@ -46,7 +40,6 @@ server <- function(input, output) {
 }
 shinyApp(ui, server)
 }
-
 }
 \seealso{
 \code{\link[=updateTextInput]{updateTextInput()}}
--- a/man/updateSelectInput.Rd
+++ b/man/updateSelectInput.Rd
@@ -30,13 +30,14 @@ updateVarSelectizeInput(session, inputId, label = NULL, data = NULL,
 \item{choices}{List of values to select from. If elements of the list are
 named, then that name --- rather than the value --- is displayed to the
 user. It's also possible to group related inputs by providing a named list
-whose elements are (either named or unnamed) lists, vectors, or factors. In
-this case, the outermost names will be used as the group labels (leveraging
-the \code{<optgroup>} HTML tag) for the elements in the respective sublist. See
-the example section for a small demo of this feature.}
+whose elements are (either named or unnamed) lists, vectors, or factors. In this
+case, the outermost names will be used as the group labels (leveraging the
+\code{<optgroup>} HTML tag) for the elements in the respective sublist. See the
+example section for a small demo of this feature.}

-\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
-single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if
+\code{multiple = TRUE}). If not specified then defaults to the first value
+for single-select lists and no values for multiple select lists.}

 \item{options}{A list of options. See the documentation of \pkg{selectize.js}
 for possible options (character option values inside \code{\link[base:I]{base::I()}} will
--- a/man/varSelectInput.Rd
+++ b/man/varSelectInput.Rd
@@ -17,8 +17,9 @@ varSelectizeInput(inputId, ..., options = NULL, width = NULL)

 \item{data}{A data frame. Used to retrieve the column names as choices for a \code{\link[=selectInput]{selectInput()}}}

-\item{selected}{The initially selected value (or multiple values if \code{multiple = TRUE}). If not specified then defaults to the first value for
-single-select lists and no values for multiple select lists.}
+\item{selected}{The initially selected value (or multiple values if
+\code{multiple = TRUE}). If not specified then defaults to the first value
+for single-select lists and no values for multiple select lists.}

 \item{multiple}{Is selection of multiple items allowed?}

@@ -29,8 +30,8 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}

 \item{size}{Number of items to show in the selection box; a larger number
 will result in a taller box. Not compatible with \code{selectize=TRUE}.
-Normally, when \code{multiple=FALSE}, a select input will be a drop-down list,
-but when \code{size} is set, it will be a box instead.}
+Normally, when \code{multiple=FALSE}, a select input will be a drop-down
+list, but when \code{size} is set, it will be a box instead.}

 \item{...}{Arguments passed to \code{varSelectInput()}.}

@@ -47,6 +48,18 @@ Create a select list that can be used to choose a single or multiple items
 from the column names of a data frame.
 }
 \details{
+The resulting server \code{input} value will be returned as:
+\itemize{
+\item a symbol if \code{multiple = FALSE}.  The \code{input} value should be
+used with rlang's \code{\link[rlang:!!]{rlang::!!()}}. For example,
+\code{ggplot2::aes(!!input$variable)}.
+\item a list of symbols if \code{multiple = TRUE}. The \code{input} value
+should be used with rlang's \code{\link[rlang:!!!]{rlang::!!!()}} to expand
+the symbol list as individual arguments. For example,
+\code{dplyr::select(mtcars, !!!input$variabls)} which is
+equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
+}
+
 By default, \code{varSelectInput()} and \code{selectizeInput()} use the
 JavaScript library \pkg{selectize.js}
 (\url{https://github.com/selectize/selectize.js}) to instead of the basic
@@ -63,21 +76,6 @@ value when it is a single choice input and the empty string is not in the
 \code{choices} argument. This is to keep compatibility with
 \code{selectInput(..., selectize = FALSE)}.
 }
-\section{Server value}{
-
-The resulting server \code{input} value will be returned as:
-\itemize{
-\item A symbol if \code{multiple = FALSE}. The \code{input} value should be
-used with rlang's \code{\link[rlang:!!]{rlang::!!()}}. For example,
-\code{ggplot2::aes(!!input$variable)}.
-\item A list of symbols if \code{multiple = TRUE}. The \code{input} value
-should be used with rlang's \code{\link[rlang:!!!]{rlang::!!!()}} to expand
-the symbol list as individual arguments. For example,
-\code{dplyr::select(mtcars, !!!input$variabls)} which is
-equivalent to \code{dplyr::select(mtcars, !!input$variabls[[1]], !!input$variabls[[2]], ..., !!input$variabls[[length(input$variabls)]])}.
-}
-}
-
 \examples{

 ## Only run examples in interactive R sessions
--- a/man/verticalLayout.Rd
+++ b/man/verticalLayout.Rd
@@ -31,9 +31,5 @@ shinyApp(ui, server = function(input, output) { })
 }
 }
 \seealso{
-Other layout functions: \code{\link{fillPage}},
-  \code{\link{fixedPage}}, \code{\link{flowLayout}},
-  \code{\link{fluidPage}}, \code{\link{navbarPage}},
-  \code{\link{sidebarLayout}}, \code{\link{splitLayout}}
+\code{\link[=fluidPage]{fluidPage()}}, \code{\link[=flowLayout]{flowLayout()}}
 }
-\concept{layout functions}
--- a/srcjs/init_shiny.js
+++ b/srcjs/init_shiny.js
@@ -457,7 +457,7 @@ function initShiny() {
  initialValues['.clientdata_url_hash'] = window.location.hash;

  $(window).on('hashchange', function(e) {
-    inputs.setInput('.clientdata_url_hash', window.location.hash);
+    inputs.setInput('.clientdata_url_hash', location.hash);
  });

  // The server needs to know what singletons were rendered as part of
--- a/srcjs/input_rate.js
+++ b/srcjs/input_rate.js
@@ -238,7 +238,7 @@ var InputNoResendDecorator = function(target, initialValues) {
      return;
    }
    this.lastSentValues[inputName] = { jsonValue, inputType };
-    this.target.setInput(nameType, value, opts);
+    this.target.setInput(name, value, opts);
  };
  this.reset = function(values = {}) {
    // Given an object with flat name-value format:
@@ -281,7 +281,7 @@ var InputEventDecorator = function(target) {
    $(opts.el).trigger(evt);

    if (!evt.isDefaultPrevented()) {
-      let name = evt.name;
+      name = evt.name;
      if (evt.inputType !== '') name += ':' + evt.inputType;

      // Most opts aren't passed along to lower levels in the input decorator
@@ -345,13 +345,13 @@ var InputDeferDecorator = function(target) {
    if (/^\./.test(nameType))
      this.target.setInput(nameType, value, opts);
    else
-      this.pendingInput[nameType] = { value, opts };
+      this.pendingInput[name] = { value, opts };
  };
  this.submit = function() {
-    for (var nameType in this.pendingInput) {
-      if (this.pendingInput.hasOwnProperty(nameType)) {
-        let { value, opts } = this.pendingInput[nameType];
-        this.target.setInput(nameType, value, opts);
+    for (var name in this.pendingInput) {
+      if (this.pendingInput.hasOwnProperty(name)) {
+        let input = this.pendingInput[name];
+        this.target.setInput(name, input.value, input.opts);
      }
    }
  };
--- a/srcjs/output_binding_image.js
+++ b/srcjs/output_binding_image.js
@@ -656,7 +656,9 @@ imageutils.createClickInfo = function($el, dblclickId, dblclickDelay) {
    var e2 = $.Event(newEventType, {
      which:   e.which,
      pageX:   e.pageX,
-      pageY:   e.pageY
+      pageY:   e.pageY,
+      offsetX: e.offsetX,
+      offsetY: e.offsetY
    });

    $el.trigger(e2);
@@ -705,8 +707,8 @@ imageutils.createClickInfo = function($el, dblclickId, dblclickDelay) {
      // click. Instead, immediately trigger a mousedown2 for the previous
      // click, and set this click as a new first click.
      if (pending_e &&
-          Math.abs(pending_e.pageX - e.pageX) > 2 ||
-          Math.abs(pending_e.pageY - e.pageY) > 2) {
+          Math.abs(pending_e.offsetX - e.offsetX) > 2 ||
+          Math.abs(pending_e.offsetY - e.offsetY) > 2) {

        triggerPendingMousedown2();
        scheduleMousedown2(e);
--- a/srcjs/reactlog.js
+++ b/srcjs/reactlog.js
@@ -9,18 +9,8 @@ $(document).on('keydown', function(e) {


 $(document).on('keydown', function(e) {
-  if (
-    // if not one of the key combos below
-    !(
-      // cmd/ctrl + fn + f4
-      (e.which === 115 && (e.ctrlKey || e.metaKey) && !e.shiftKey && !e.altKey) ||
-      // cmd/ctrl + shift + fn + f3
-      (e.which === 114 && (e.ctrlKey || e.metaKey) && e.shiftKey && !e.altKey)
-    )
-  ) {
+  if (e.which !== 115 || (!e.ctrlKey && !e.metaKey) || (e.shiftKey || e.altKey))
    return;
-  }
-
  var url = 'reactlog/mark?w=' + window.escape(exports.shinyapp.config.workerId) +
    "&s=" + window.escape(exports.shinyapp.config.sessionId);

@@ -34,9 +24,6 @@ $(document).on('keydown', function(e) {
      html: html,
      closeButton: true,
    });
-  }).fail(function() {
-    // found returned error while marking, should open webpage
-    window.open(url);
  });

  e.preventDefault();
--- a/tests/testthat/test-bootstrap.r
+++ b/tests/testthat/test-bootstrap.r
@@ -69,7 +69,7 @@ test_that("Repeated names for selectInput and radioButtons choices", {


 test_that("Choices are correctly assigned names", {
-  # Empty non-list comes back as a list with names
+  # Empty non-list comes back with names
  expect_identical(
    choicesWithNames(numeric(0)),
    stats::setNames(list(), character(0))
@@ -79,16 +79,6 @@ test_that("Choices are correctly assigned names", {
    choicesWithNames(list()),
    stats::setNames(list(), character(0))
  )
-  # NULL comes back as an empty list with names
-  expect_identical(
-    choicesWithNames(NULL),
-    stats::setNames(list(), character(0))
-  )
-  # NA is processed as a leaf, not a group
-  expect_identical(
-    choicesWithNames(NA),
-    as.list(stats::setNames(as.character(NA), NA))
-  )
  # Empty character vector
  # An empty character vector isn't a sensical input, but we preserved this test
  # in the off chance that somebody relies on the existing behavior.
@@ -161,19 +151,8 @@ test_that("Choices are correctly assigned names", {
    choicesWithNames(list(A="a", "b", C=list("d", E="e"))),
    list(A="a", b="b", C=list(d="d", E="e"))
  )
-  # List, with a single-item unnamed group list
-  expect_identical(
-    choicesWithNames(list(C=list(123))),
-    list(C=list("123"="123"))
-  )
  # Error when sublist is unnamed
  expect_error(choicesWithNames(list(A="a", "b", list(1,2))))
-  # Error when list is unnamed and contains a group
-  # NULL, list(1,2), and anything of length() == 0 is considered a group.
-  # NA is NOT a group.
-  expect_error(choicesWithNames(list(NULL)), regexp = "must be named")
-  expect_error(choicesWithNames(list(list(1,2))), regexp = "must be named")
-  expect_error(choicesWithNames(list(character(0))), regexp = "must be named")
  # Unnamed factor
  expect_identical(
    choicesWithNames(factor(c("a","b","3"))),
@@ -194,16 +173,6 @@ test_that("Choices are correctly assigned names", {
    choicesWithNames(list(A="a", B="b", C=structure(factor(c("d", "e")), names = c("d", "e")))),
    list(A="a", B="b", C=list(d="d", e="e"))
  )
-  # List, named, with an empty group as an unnamed empty list
-  expect_identical(
-    choicesWithNames(list(C=list())),
-    list(C=stats::setNames(list(), character()))
-  )
-  # List, named, with an empty group as an unnamed empty vector
-  expect_identical(
-    choicesWithNames(list(C=c())),
-    list(C=stats::setNames(list(), character()))
-  )
 })


--- a/tests/testthat/test-pkgdown.R
+++ b/tests/testthat/test-pkgdown.R
@@ -1,40 +0,0 @@
-context("pkgdown")
-
-get_exported <- function() {
-  if (all(file.exists(c('../../inst/_pkgdown.yml', '../../man')))) {
-    # We're running tests on a source tree, likely by devtools::test()
-    sub("\\.Rd", "", list.files("../../man", pattern = "*.Rd"))
-  } else {
-    # We're testing an installed package, possibly for R CMD check
-    unique(unname(readRDS("../../shiny/help/aliases.rds")))
-  }
-}
-
-get_indexed <- function(f = system.file('_pkgdown.yml', package = 'shiny')) {
-  unlist(lapply(yaml::yaml.load_file(f)$reference, function(x) x$contents))
-}
-
-test_that("All man pages have an entry in _pkgdown.yml", {
-  skip_on_cran()
-  indexed_topics <- get_indexed()
-  all_topics     <- get_exported()
-
-  ## Known not to be indexed
-  known_unindexed <- c("shiny-package", "stacktrace", "knitr_methods",
-                       "pageWithSidebar", "headerPanel", "shiny.appobj",
-                       "deprecatedReactives")
-
-  ## This test ensures that every documented topic is included in
-  ## staticdocs/index.r, unless explicitly waived by specifying it
-  ## in the known_unindexed variable above.
-  missing <- setdiff(all_topics, c(known_unindexed, indexed_topics))
-  unknown <- setdiff(c(known_unindexed, indexed_topics), all_topics)
-  expect_equal(length(missing), 0,
-    info = paste("Functions missing from _pkgdown.yml:\n",
-      paste("  ", missing, sep = "", collapse = "\n"),
-      sep = ""))
-  expect_equal(length(unknown), 0,
-    info = paste("Unrecognized functions in _pkgdown.yml:\n",
-      paste("  ", unknown, sep = "", collapse = "\n"),
-      sep = ""))
-})
--- a/tests/testthat/test-stacks.R
+++ b/tests/testthat/test-stacks.R
@@ -48,59 +48,50 @@ dumpTests <- function(df) {
 }

 test_that("integration tests", {
-  # The expected call stack can be changed by other packages (namely, promises).
-  # If promises changes its internals, it can break this test on CRAN. Because
-  # CRAN package releases are generally not synchronized (that is, promises and
-  # shiny can't be updated at the same time, unless there is manual intervention
-  # from CRAN maintaineres), these specific test expectations make it impossible
-  # to release a version of promises that will not break this test and cause
-  # problems on CRAN.
-  skip_on_cran()
-
  df <- causeError(full = FALSE)
  # dumpTests(df)

-  expect_equal(df$num, c(56L, 55L, 54L, 38L, 37L, 36L, 35L,
+  expect_equal(df$num, c(56L, 55L, 54L, 38L, 37L, 36L, 35L, 
    34L, 33L, 32L, 31L, 30L))
-  expect_equal(df$call, c("A", "B", "<reactive:C>", "C", "renderTable",
-    "func", "force", "withVisible", "withCallingHandlers", "domain$wrapSync",
+  expect_equal(df$call, c("A", "B", "<reactive:C>", "C", "renderTable", 
+    "func", "force", "withVisible", "withCallingHandlers", "globals$domain$wrapSync", 
    "promises::with_promise_domain", "captureStackTraces"))
-  expect_equal(nzchar(df$loc), c(TRUE, TRUE, TRUE, FALSE, TRUE,
+  expect_equal(nzchar(df$loc), c(TRUE, TRUE, TRUE, FALSE, TRUE, 
    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE))
-
+  
  df <- causeError(full = TRUE)
  # dumpTests(df)

-  expect_equal(df$num, c(59L, 58L, 57L, 56L, 55L, 54L, 53L,
-    52L, 51L, 50L, 49L, 48L, 47L, 46L, 45L, 44L, 43L, 42L, 41L,
-    40L, 39L, 38L, 37L, 36L, 35L, 34L, 33L, 32L, 31L, 30L, 29L,
-    28L, 27L, 26L, 25L, 24L, 23L, 22L, 21L, 20L, 19L, 18L, 17L,
-    16L, 15L, 14L, 13L, 12L, 11L, 10L, 9L, 8L, 7L, 6L, 5L, 4L,
+  expect_equal(df$num, c(59L, 58L, 57L, 56L, 55L, 54L, 53L, 
+    52L, 51L, 50L, 49L, 48L, 47L, 46L, 45L, 44L, 43L, 42L, 41L, 
+    40L, 39L, 38L, 37L, 36L, 35L, 34L, 33L, 32L, 31L, 30L, 29L, 
+    28L, 27L, 26L, 25L, 24L, 23L, 22L, 21L, 20L, 19L, 18L, 17L, 
+    16L, 15L, 14L, 13L, 12L, 11L, 10L, 9L, 8L, 7L, 6L, 5L, 4L, 
    3L, 2L, 1L))
-  expect_equal(df$call, c("h", ".handleSimpleError", "stop",
-    "A", "B", "<reactive:C>", "..stacktraceon..", ".func", "withVisible",
-    "withCallingHandlers", "contextFunc", "env$runWith", "force",
-    "domain$wrapSync", "promises::with_promise_domain",
-    "withReactiveDomain", "domain$wrapSync", "promises::with_promise_domain",
-    "ctx$run", "self$.updateValue", "..stacktraceoff..", "C",
-    "renderTable", "func", "force", "withVisible", "withCallingHandlers",
-    "domain$wrapSync", "promises::with_promise_domain",
-    "captureStackTraces", "doTryCatch", "tryCatchOne", "tryCatchList",
-    "tryCatch", "do", "hybrid_chain", "origRenderFunc", "renderTable({     C() }, server = FALSE)",
-    "..stacktraceon..", "contextFunc", "env$runWith", "force",
-    "domain$wrapSync", "promises::with_promise_domain",
-    "withReactiveDomain", "domain$wrapSync", "promises::with_promise_domain",
-    "ctx$run", "..stacktraceoff..", "isolate", "withCallingHandlers",
-    "domain$wrapSync", "promises::with_promise_domain",
-    "captureStackTraces", "doTryCatch", "tryCatchOne", "tryCatchList",
+  expect_equal(df$call, c("h", ".handleSimpleError", "stop", 
+    "A", "B", "<reactive:C>", "..stacktraceon..", ".func", "withVisible", 
+    "withCallingHandlers", "contextFunc", "env$runWith", "force", 
+    "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "withReactiveDomain", "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "ctx$run", "self$.updateValue", "..stacktraceoff..", "C", 
+    "renderTable", "func", "force", "withVisible", "withCallingHandlers", 
+    "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "captureStackTraces", "doTryCatch", "tryCatchOne", "tryCatchList", 
+    "tryCatch", "do", "hybrid_chain", "origRenderFunc", "renderTable({     C() }, server = FALSE)", 
+    "..stacktraceon..", "contextFunc", "env$runWith", "force", 
+    "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "withReactiveDomain", "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "ctx$run", "..stacktraceoff..", "isolate", "withCallingHandlers", 
+    "globals$domain$wrapSync", "promises::with_promise_domain", 
+    "captureStackTraces", "doTryCatch", "tryCatchOne", "tryCatchList", 
    "tryCatch", "try"))
-  expect_equal(nzchar(df$loc), c(FALSE, FALSE, FALSE, TRUE,
-    TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE,
-    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE,
-    FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE,
+  expect_equal(nzchar(df$loc), c(FALSE, FALSE, FALSE, TRUE, 
+    TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 
+    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 
+    TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 
+    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, 
+    FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, 
+    FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, 
    FALSE))
 })

--- a/tests/testthat/test-staticdocs.R
+++ b/tests/testthat/test-staticdocs.R
@@ -0,0 +1,52 @@
+context("staticdocs")
+
+test_that("All man pages have an entry in staticdocs/index.r", {
+  if (all(file.exists(c('../../inst/staticdocs', '../../man')))) {
+    # We're running tests on a source tree
+    mode <- "source"
+  } else if (all(file.exists(c('../../shiny/staticdocs', '../../shiny/html')))) {
+    # We're testing an installed package, possibly for R CMD check
+    mode <- "bundle"
+  } else {
+    cat("Unknown testing environment for test-staticdocs.R.\n", file = stderr())
+    return()
+  }
+
+  # Known not to be indexed
+  known_unindexed <- c("shiny-package", "stacktrace", "knitr_methods",
+                       "pageWithSidebar", "headerPanel", "shiny.appobj",
+                       "deprecatedReactives")
+
+  # Read in topics from a staticdocs/index.r file
+  get_indexed_topics <- function(index_path) {
+    result <- character(0)
+    sd_section <- function(dummy1, dummy2, section_topics) {
+      result <<- c(result, section_topics)
+    }
+    source(index_path, local = TRUE)
+    result
+  }
+
+  if (mode == "source") {
+    indexed_topics <- get_indexed_topics("../../inst/staticdocs/index.r")
+    all_topics <- sub("\\.Rd", "", list.files("../../man", pattern = "*.Rd"))
+
+  } else if (mode == "bundle") {
+    indexed_topics <- get_indexed_topics("../../shiny/staticdocs/index.r")
+    all_topics <- unique(unname(readRDS("../../shiny/help/aliases.rds")))
+  }
+
+  # This test ensures that every documented topic is included in
+  # staticdocs/index.r, unless explicitly waived by specifying it
+  # in the known_unindexed variable above.
+  missing <- setdiff(sort(all_topics), sort(c(known_unindexed, indexed_topics)))
+  unknown <- setdiff(sort(c(known_unindexed, indexed_topics)), sort(all_topics))
+  expect_equal(length(missing), 0,
+    info = paste("Functions missing from index:\n",
+      paste("  ", missing, sep = "", collapse = "\n"),
+      sep = ""))
+  expect_equal(length(unknown), 0,
+    info = paste("Unrecognized functions in index.r:\n",
+      paste("  ", unknown, sep = "", collapse = "\n"),
+      sep = ""))
+})
--- a/tools/Gruntfile.js
+++ b/tools/Gruntfile.js
@@ -110,9 +110,6 @@ module.exports = function(grunt) {
          "dot-location": [1, "property"],
          "eqeqeq": 1,
          // "no-shadow": 1,
-          "no-implicit-globals": 1,
-          "no-restricted-globals": ["error", "name", "length", "top", "location", "parent", "status"],
-          "no-global-assign": 1,
          "no-undef": 1,
          "no-unused-vars": [1, {"args": "none"}],
          "guard-for-in": 1,