shiny-insert-tab can now accommodate a JSXTag

.eslintrc.yml

@@ -6,6 +6,7 @@ extends:
   - 'eslint:recommended'
   - 'plugin:@typescript-eslint/recommended'
   - 'plugin:jest/recommended'
+  - 'prettier/@typescript-eslint'
   - 'plugin:prettier/recommended'
   - 'plugin:jest-dom/recommended'
 globals:
@@ -44,6 +45,9 @@ rules:
   semi:
     - error
     - always
+  newline-after-var:
+    - error
+    - always
   dot-location:
     - error
     - property
@@ -60,7 +64,6 @@ rules:
     - error
     - default: array-simple
       readonly: array-simple
-
   "@typescript-eslint/consistent-indexed-object-style":
     - error
     - index-signature

.github/workflows/R-CMD-check.yaml

@@ -21,5 +21,3 @@ jobs:
       node-version: "14.x"
   R-CMD-check:
     uses: rstudio/shiny-workflows/.github/workflows/R-CMD-check.yaml@v1
-    with:
-      cache-version: "2.1"

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.3.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.7.4.9001
+Version: 1.7.1.9003
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "winston@rstudio.com", comment = c(ORCID = "0000-0002-1576-2126")),
     person("Joe", "Cheng", role = "aut", email = "joe@rstudio.com"),
@@ -78,8 +78,8 @@ Imports:
     mime (>= 0.3),
     jsonlite (>= 0.9.16),
     xtable,
-    fontawesome (>= 0.4.0),
-    htmltools (>= 0.5.4),
+    fontawesome (>= 0.2.1),
+    htmltools (>= 0.5.2),
     R6 (>= 2.0),
     sourcetools,
     later (>= 1.0.0),
@@ -105,6 +105,7 @@ Suggests:
     ggplot2,
     reactlog (>= 1.0.0),
     magrittr,
+    shinytest (>= 1.4.0.9003),
     yaml,
     future,
     dygraphs,
@@ -198,14 +199,11 @@ Collate:
     'version_bs_date_picker.R'
     'version_ion_range_slider.R'
     'version_jquery.R'
-    'version_jqueryui.R'
     'version_selectize.R'
     'version_strftime.R'
     'viewer.R'
-RoxygenNote: 7.2.3
+RoxygenNote: 7.1.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RdMacros: lifecycle
 Config/testthat/edition: 3
-Config/Needs/check:
-  shinytest2

NEWS.md

@@ -1,94 +1,32 @@
-# shiny 1.7.4.9001
+shiny development
+================
 
 ## Full changelog
 
 ### Breaking changes
 
-### New features and improvements
-
-* Closed #789: `<script>` loaded from dynamic UI are no longer loaded using synchronous `XMLHttpRequest` (via jQuery). (#3666)
-
-### Bug fixes
-
-
-# shiny 1.7.4
-
-## Full changelog
-
-### Breaking changes
-
-* Closed #3719: Output container sizes, which are available via [`session$clientData` and `getCurrentOutputInfo()`](https://shiny.rstudio.com/articles/client-data.html), no longer round to the nearest pixel (i.e., they are now more exact, possibly fractional values). (#3720)
-
-* Closed #3704, #3735, and #3740: `renderPlot()` no longer generates an error (or segfault) when it executes before the output is visible. Instead, it'll now use the graphics device's default size for it's initial size. Relatedly, `plotPNG()` now ignores `NULL` values for `width`/`height` (and uses the device's default `width`/`height` instead). (#3739)
-
-### New features and improvements
-
-* `plotOutput()`, `imageOutput()`, and `uiOutput()` gain a `fill` argument. If `TRUE` (the default for `plotOutput()`), the output container is allowed to grow/shrink to fit a fill container (created via `htmltools::bindFillRole()`) with an opinionated height. This means `plotOutput()` will grow/shrink by default [inside of `bslib::card_body_fill()`](https://rstudio.github.io/bslib/articles/cards.html#responsive-sizing), but `imageOutput()` and `uiOutput()` will have to opt-in to similar behavior with `fill = TRUE`. (#3715) 
-
-* Closed #3687: Updated jQuery-UI to v1.13.2. (#3697)
-
-* Internal: Added clearer and strict TypeScript type definitions (#3644)
-
-
-# shiny 1.7.3
-
-### Bug fixes
-
-* Shiny 1.7.0 changed the `icon(lib="fontawesome")` implementation from a bundled copy of fontawesome, to the {fontawesome} package. This led to issue #3688, where icons that were previously working, were now breaking. That's because {fontawesome} 0.3.0 and earlier did not have support for icon names used in Font Awesome 5 and earlier, only the newest icon names used in Font Awesome 6. Now, {fontawesome} 0.4.0 has restored support for those older icon names, and Shiny 1.7.2.1 has updated its {fontawesome} requirement to >=0.4.0.
-
-
-# shiny 1.7.2
-
-## Full changelog
-
-### Breaking changes
-
-* Closed #3626: `renderPlot()` (and `plotPNG()`) now uses `ragg::agg_png()` by default when the [`{ragg}` package](https://github.com/r-lib/ragg) is installed. To restore the previous behavior, set `options(shiny.useragg = FALSE)`. (#3654)
-
-### New features and improvements
-
-* Closed #1545: `insertUI()` now executes `<script>` tags. (#3630)
-
-* `fileInput()` can set the `capture` attribute to facilitates user access to a device's media capture mechanism, such as a camera, or microphone, from within a file upload control ([W3C HTML Media Capture](https://www.w3.org/TR/html-media-capture/)). (Thanks to khaled-alshamaa, #3481)
-
-* Closed tidyverse/dplyr#5552: Compatibility of dplyr 1.0 (and rlang chained errors in general) with `req()`, `validate()`, and friends.
-
-* Closed tidyverse/dplyr#6154: Values from an `actionButton()` had S3 classes in the incorrect order.
-
-* Closed #3346: Default for `ref` input in `runGithub()` changed from `"master"` to `"HEAD"`. (#3564)
-
-* Closed #3619: In R 4.2, `splitLayout()` no longer raises warnings about incorrect length in an `if` statement. (Thanks to @dmenne, #3625)
-
-### Bug fixes
-
-* Closed #3250:`{rlang}`/`{tidyeval}` conditions (i.e., warnings and errors) are no longer filtered from stack traces. (#3602)
-
-* Closed #3581: Errors in throttled/debounced reactive expressions no longer cause the session to exit. (#3624)
-
-* Closed #3657: `throttle.ts` and the `Throttler` typescript objects it provides now function as intended. (Thanks gto @dvg-p4, #3659)
-
-* The auto-reload feature (`options(shiny.autoreload=TRUE)`) was not being activated by `devmode(TRUE)`, despite a console message asserting that it was. (#3620)
-
-* Closed #2297: If an error occurred in parsing a value in a bookmark query string, an error would be thrown and nothing would be restored. Now a message is displayed and that value is ignored. (Thanks to @daattali, #3385)
-
-* Restored the previous behavior of automatically guessing the `Content-Type` header for `downloadHandler` functions when no explicit `contentType` argument is supplied. (#3393)
-
-* Previously, updating an input value without a corresponding Input binding element did not trigger a JavaScript `shiny:inputchanged` event. Now, if no Input binding element is found, the `shiny:inputchanged` event is triggered on `window.document`. (#3584)
-
-* Closed #2955: Input and output bindings previously attempted to use `el['data-input-id']`, but that never worked. They now use `el.getAttribute('data-input-id')` instead. (#3538)
-
-### Minor improvements
-
-* When taking a test snapshot, the sort order of the json keys of the `input`, `output`, and `export` fields is currently sorted using the locale of the machine. This can lead to inconsistent test snapshot results. To opt-in to a consistent ordering of snapshot fields with `{shinytest}`, please set the global option `options(shiny.snapshotsortc = TRUE)`. `{shinytest2}` users do not need to set this value. (#3515)
-
-* Closed rstudio/shinytest2#222: When restoring a context (i.e., bookmarking) from a URL, Shiny now better handles a trailing `=` after `_inputs_` and `_values_`. (#3648)
+### Minor new features and improvements
 
 * Shiny's internal HTML dependencies are now mounted dynamically instead of statically. (#3537)
 
 * HTML dependencies that are sent to dynamic UI now have better type checking, and no longer require a `dep.src.href` field. (#3537)
 
+* Default for `ref` input in `runGithub()` changed from `"master"` to `"HEAD"`. (#3346)
 
-# shiny 1.7.1
+* When taking a test snapshot, the sort order of the json keys of the `input`, `output`, and `export` fields is currently sorted using the locale of the machine. This can lead to inconsistent test snapshot results. To opt-in to a consistent ordering of snapshot fields with `{shinytest}`, please set the global option `options(shiny.snapshotsortc = TRUE)`. `{shinytest2}` users do not need to set this value.  (#3515)
+
+### Bug fixes
+
+* Closed tidyverse/dplyr#5552: Compatibility of dplyr 1.0 (and rlang chained errors in general) with `req()`, `validate()`, and friends.
+
+* Closed #2955: Input and output bindings previously attempted to use `el['data-input-id']`, but that never worked. They now use `el.getAttribute('data-input-id')` instead. (#3538)
+
+* Closed tidyverse/dplyr#6154: Values from an `actionButton()` had S3 classes in the incorrect order.
+
+* Fixed a bug where updating an input value without a corresponding Input binding element did not trigger a JavaScript `shiny:inputchanged` event. Now, if no Input binding element is found, the `shiny:inputchanged` event is triggered on `window.document`. (#3584)
+
+shiny 1.7.1
+===========
 
 ## Bug Fixes
 
@@ -97,7 +35,8 @@
 * Re-arranged conditions for testthat 1.0.0 compatibility. (#3512)
 
 
-# shiny 1.7.0
+shiny 1.7.0
+===========
 
 ## Full changelog
 
@@ -154,7 +93,8 @@
 
 * Updated to jQuery 3.6.0. (#3311)
 
-# shiny 1.6.0
+shiny 1.6.0
+===========
 
 This release focuses on improvements in three main areas:
 
@@ -263,7 +203,8 @@ This release focuses on improvements in three main areas:
 * Removed es5-shim library, which was internally used within `selectInput()` for ECMAScript 5 compatibility. (#2993)
 
 
-# shiny 1.5.0
+shiny 1.5.0
+===========
 
 ## Full changelog
 
@@ -316,17 +257,20 @@ This release focuses on improvements in three main areas:
 * Updated from Font-Awesome 5.3.1 to 5.13.0, which includes icons related to COVID-19. For upgrade notes, see https://github.com/FortAwesome/Font-Awesome/blob/master/UPGRADING.md. (#2891)
 
 
-# shiny 1.4.0.2
+shiny 1.4.0.2
+===========
 
 Minor patch release: fixed some timing-dependent tests failed intermittently on CRAN build machines.
 
 
-# shiny 1.4.0.1
+shiny 1.4.0.1
+===========
 
 Minor patch release to account for changes to the grid package that will be upcoming in the R 4.0 release (#2776).
 
 
-# shiny 1.4.0
+shiny 1.4.0
+===========
 
 ## Full changelog
 
@@ -389,7 +333,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2329, #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.
 
 
-# shiny 1.3.2
+shiny 1.3.2
+===========
 
 ### Bug fixes
 
@@ -398,7 +343,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2280: Shiny applications that used a www/index.html file did not serve up the index file. (#2382)
 
 
-# shiny 1.3.1
+shiny 1.3.1
+===========
 
 ## Full changelog
 
@@ -407,7 +353,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed a performance issue introduced in v1.3.0 when using large nested lists within Shiny. (#2377)
 
 
-# shiny 1.3.0
+shiny 1.3.0
+===========
 
 ## Full changelog
 
@@ -438,7 +385,8 @@ Minor patch release to account for changes to the grid package that will be upco
 * Fixed #2247: `renderCachedPlot` now supports using promises for either `expr` or `cacheKeyExpr`. (Shiny v1.2.0 supported async `expr`, but only if `cacheKeyExpr` was async as well; now you can use any combination of sync/async for `expr` and `cacheKeyExpr`.) #2261
 
 
-# shiny 1.2.0
+shiny 1.2.0
+===========
 
 This release features plot caching, an important new tool for improving performance and scalability. Using `renderCachedPlot` in place of `renderPlot` can greatly improve responsiveness for apps that show the same plot many times (for example, a dashboard or report where all users view the same data). Shiny gives you a fair amount of control in where the cache is stored and how cached plots are invalidated, so be sure to read [this article](https://shiny.rstudio.com/articles/plot-caching.html) to get the most out of this feature.
 
@@ -503,7 +451,8 @@ This release features plot caching, an important new tool for improving performa
 * Addressed #1864 by changing `optgroup` documentation to use `list` instead of `c`. (#2084)
 
 
-# shiny 1.1.0
+shiny 1.1.0
+===========
 
 This is a significant release for Shiny, with a major new feature that was nearly a year in the making: support for asynchronous operations! Until now, R's single-threaded nature meant that performing long-running calculations or tasks from Shiny would bring your app to a halt for other users of that process. This release of Shiny deeply integrates the [promises](https://rstudio.github.io/promises/) package to allow you to execute some tasks asynchronously, including as part of reactive expressions and outputs. See the [promises](https://rstudio.github.io/promises/) documentation to learn more.
 
@@ -539,7 +488,7 @@ This is a significant release for Shiny, with a major new feature that was nearl
 
 * Removed the (ridiculously outdated) "experimental feature" tag from the reference documentation for `renderUI`. (#2036)
 
-* Addressed #1907: the `ignoreInit` argument was first added only to `observeEvent`. Later, we also added it to `eventReactive`, but forgot to update the documentation. Now done, thanks @flo12392! (#2036)
+* Addressed #1907: the `ignoreInit` argument was first added only to `observeEvent`. Later, we also added it to `eventReactive`, but forgot to update the documentation. Now done, thanks [@flo12392](https://github.com/flo12392)! (#2036)
 
 ### Bug fixes
 
@@ -553,7 +502,7 @@ This is a significant release for Shiny, with a major new feature that was nearl
 
 * Fixed #1600: URL-encoded bookmarking did not work with sliders that had dates or date-times. (#1961)
 
-* Fixed #1962: [File dragging and dropping](https://www.rstudio.com/blog/shiny-1-0-4/) broke in the presence of jQuery version 3.0 as introduced by the [rhandsontable](https://jrowen.github.io/rhandsontable/) [htmlwidget](https://www.htmlwidgets.org/). (#2005)
+* Fixed #1962: [File dragging and dropping](https://blog.rstudio.com/2017/08/15/shiny-1-0-4/) broke in the presence of jQuery version 3.0 as introduced by the [rhandsontable](https://jrowen.github.io/rhandsontable/) [htmlwidget](https://www.htmlwidgets.org/). (#2005)
 
 * Improved the error handling inside the `addResourcePath()` function, to give end users more informative error messages when the `directoryPath` argument cannot be normalized. This is especially useful for `runtime: shiny_prerendered` Rmd documents, like `learnr` tutorials. (#1968)
 
@@ -576,7 +525,8 @@ This is a significant release for Shiny, with a major new feature that was nearl
 In some rare cases, interrupting an application (by pressing Ctrl-C or Esc) may result in the message `Error in execCallbacks(timeoutSecs) : c++ exception (unknown reason)`. Although this message sounds alarming, it is harmless, and will go away in a future version of the later package (more information [here](https://github.com/r-lib/later/issues/55)).
 
 
-# shiny 1.0.5
+shiny 1.0.5
+===========
 
 ## Full changelog
 
@@ -589,7 +539,8 @@ In some rare cases, interrupting an application (by pressing Ctrl-C or Esc) may
 * Fixed #1824: HTTP HEAD requests on static files caused the application to stop. (#1825)
 
 
-# shiny 1.0.4
+shiny 1.0.4
+===========
 
 There are three headlining features in this release of Shiny. It is now possible to add and remove tabs from a `tabPanel`; there is a new function, `onStop()`, which registers callbacks that execute when an application exits; and `fileInput`s now can have files dragged and dropped on them. In addition to these features, this release has a number of minor features and bug fixes. See the full changelog below for more details.
 
@@ -650,7 +601,8 @@ There are three headlining features in this release of Shiny. It is now possible
 * Fixed #1474: A `browser()` call in an observer could cause an error in the RStudio IDE on Windows. (#1802)
 
 
-# shiny 1.0.3
+shiny 1.0.3
+================
 
 This is a hotfix release of Shiny. With previous versions of Shiny, when running an application on the newly-released version of R, 3.4.0, it would print a message: `Warning in body(fun) : argument is not a function`. This has no effect on the application, but because the message could be alarming to users, we are releasing a new version of Shiny that fixes this issue.
 
@@ -663,7 +615,8 @@ This is a hotfix release of Shiny. With previous versions of Shiny, when running
 * Fixed #1676: On R 3.4.0, running a Shiny application gave a warning: `Warning in body(fun) : argument is not a function`. (#1677)
 
 
-# shiny 1.0.2
+shiny 1.0.2
+================
 
 This is a hotfix release of Shiny. The primary reason for this release is because the web host for MathJax JavaScript library is scheduled to be shut down in the next few weeks. After it is shut down, Shiny applications that use MathJax will no longer be able to load the MathJax library if they are run with Shiny 1.0.1 and below. (If you don't know whether your application uses MathJax, it probably does not.) For more information about why the MathJax CDN is shutting down, see https://www.mathjax.org/cdn-shutting-down/.
 
@@ -682,7 +635,8 @@ This is a hotfix release of Shiny. The primary reason for this release is becaus
 * Fixed #1653: wrong code example in documentation. (#1658)
 
 
-# shiny 1.0.1
+shiny 1.0.1
+================
 
 This is a maintenance release of Shiny, mostly aimed at fixing bugs and introducing minor features. The most notable additions in this version of Shiny are the introduction of the `reactiveVal()` function (it's like `reactiveValues()`, but it only stores a single value), and that the choices of `radioButtons()` and `checkboxGroupInput()` can now contain HTML content instead of just plain text.
 
@@ -752,7 +706,8 @@ in shiny apps. For more info, see the documentation (`?updateQueryString` and `?
 * Closed #1500: Updated ion.rangeSlider to 2.1.6. (#1540)
 
 
-# shiny 1.0.0
+shiny 1.0.0
+===========
 
 Shiny has reached a milestone: version 1.0.0! In the last year, we've added two major features that we considered essential for a 1.0.0 release: bookmarking, and support for testing Shiny applications. As usual, this version of Shiny also includes many minor features and bug fixes.
 
@@ -817,7 +772,8 @@ Now there's an official way to slow down reactive values and expressions that in
 * Updated to Font Awesome 4.7.0.
 
 
-# shiny 0.14.2
+shiny 0.14.2
+============
 
 This is a maintenance release of Shiny, with some bug fixes and minor new features.
 
@@ -845,7 +801,8 @@ This is a maintenance release of Shiny, with some bug fixes and minor new featur
 
 * Fixed a bug where, in versions of R before 3.2, Shiny applications could crash due to a bug in R's implementation of `list2env()`. (#1446)
 
-# shiny 0.14.1
+shiny 0.14.1
+============
 
 This is a maintenance release of Shiny, with some bug fixes and minor new features.
 
@@ -875,7 +832,8 @@ This is a maintenance release of Shiny, with some bug fixes and minor new featur
 * Updated to jQuery UI 1.12.1. Previously, Shiny included a build of 1.11.4 which was missing the datepicker component due to a conflict with the bootstrap-datepicker used by Shiny's `dateInput()` and `dateRangeInput()`. (#1374)
 
 
-# shiny 0.14
+shiny 0.14
+==========
 
 A new Shiny release is upon us! There are many new exciting features, bug fixes, and library updates. We'll just highlight the most important changes here, but you can browse through the full changelog below for details. This will likely be the last release before shiny 1.0, so get out your party hats!
 
@@ -1074,12 +1032,14 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Updated to jQuery 1.12.4.
 
 
-# shiny 0.13.2
+shiny 0.13.2
+============
 
 * Updated documentation for `htmlTemplate`.
 
 
-# shiny 0.13.1
+shiny 0.13.1
+============
 
 * `flexCol` did not work on RStudio for Windows or Linux.
 
@@ -1088,7 +1048,8 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * BREAKING CHANGE: The long-deprecated ability to pass functions (rather than expressions) to reactive() and observe() has finally been removed.
 
 
-# shiny 0.13.0
+shiny 0.13.0
+============
 
 * Fixed #962: plot interactions did not work with the development version of ggplot2 (after ggplot2 1.0.1).
 
@@ -1139,7 +1100,8 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Added support for the new htmltools 0.3 feature `htmlTemplate`. It's now possible to use regular HTML markup to design your UI, but still use R expressions to define inputs, outputs, and HTML widgets.
 
 
-# shiny 0.12.2
+shiny 0.12.2
+============
 
 * GitHub changed URLs for gists from .tar.gz to .zip, so `runGist` was updated to work with the new URLs.
 
@@ -1162,14 +1124,16 @@ There are many more minor features, small improvements, and bug fixes than we ca
 * Shiny now correctly handles HTTP HEAD requests. (#876)
 
 
-# shiny 0.12.1
+shiny 0.12.1
+============
 
 * Fixed an issue where unbindAll() causes subsequent bindAll() to be ignored for previously bound outputs. (#856)
 
 * Undeprecate `dataTableOutput` and `renderDataTable`, which had been deprecated in favor of the new DT package. The DT package is a bit too new and has a slightly different API, we were too hasty in deprecating the existing Shiny functions.
 
 
-# shiny 0.12.0
+shiny 0.12.0
+============
 
 In addition to the changes listed below (in the *Full Changelog* section), there is an infrastructure change that could affect existing Shiny apps.
 
@@ -1225,7 +1189,8 @@ Shiny 0.12.0 deprecated Shiny's dataTableOutput and renderDataTable functions an
 * renderDataTable() and dataTableOutput() have been deprecated in shiny and will be removed in future versions of shiny. Please use the DT package instead: http://rstudio.github.io/DT/ (#807)
 
 
-# shiny 0.11.1
+shiny 0.11.1
+============
 
 * Major client-side performance improvements for pages that have many conditionalPanels, tabPanels, and plotOutputs. (#693, #717, #723)
 
@@ -1252,7 +1217,8 @@ Shiny 0.12.0 deprecated Shiny's dataTableOutput and renderDataTable functions an
 * downloadHandler content callback functions are now invoked with a temp file name that has the same extension as the final filename that will be used by the download. This is to deal with the fact that some file writing functions in R will auto-append the extension for their file type (pdf, zip).
 
 
-# shiny 0.11
+shiny 0.11
+==========
 
 Shiny 0.11 switches away from the Bootstrap 2 web framework to the next version, Bootstrap 3. This is in part because Bootstrap 2 is no longer being developed, and in part because it allows us to tap into the ecosystem of Bootstrap 3 themes.
 
@@ -1330,17 +1296,20 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Password input fields can now be used, with `passwordInput()`. (#672)
 
 
-# shiny 0.10.2.2
+shiny 0.10.2.2
+==============
 
 * Remove use of `rstudio::viewer` in a code example, for R CMD check.
 
 
-# shiny 0.10.2.1
+shiny 0.10.2.1
+==============
 
 * Changed some examples to use \donttest instead of \dontrun.
 
 
-# shiny 0.10.2
+shiny 0.10.2
+============
 
 * The minimal version of R required for the shiny package is 3.0.0 now.
 
@@ -1373,7 +1342,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Added `position` parameter to `navbarPage`.
 
 
-# shiny 0.10.1
+shiny 0.10.1
+============
 
 * Added Unicode support for Windows. Shiny apps running on Windows must use the UTF-8 encoding for ui.R and server.R (also the optional global.R) if they contain non-ASCII characters. See this article for details and examples: http://shiny.rstudio.com/gallery/unicode-characters.html (#516)
 
@@ -1386,7 +1356,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Added support for option groups in the select/selectize inputs. When the `choices` argument for `selectInput()`/`selectizeInput()` is a list of sub-lists and any sub-list is of length greater than 1, the HTML tag `<optgroup>` will be used. See an example at http://shiny.rstudio.com/gallery/option-groups-for-selectize-input.html (#542)
 
 
-# shiny 0.10.0
+shiny 0.10.0
+============
 
 * BREAKING CHANGE: By default, observers now terminate themselves if they were created during a session and that session ends. See ?domains for more details.
 
@@ -1423,12 +1394,14 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * `runGitHub()` can also take a value of the form "username/repo" in its first argument, e.g. both runGitHub("shiny_example", "rstudio") and runGitHub("rstudio/shiny_example") are valid ways to run the GitHub repo.
 
 
-# shiny 0.9.1
+shiny 0.9.1
+===========
 
 * Fixed warning 'Error in Context$new : could not find function "loadMethod"' that was happening to dependent packages on "R CMD check".
 
 
-# shiny 0.9.0
+shiny 0.9.0
+===========
 
 * BREAKING CHANGE: Added a `host` parameter to runApp() and runExample(), which defaults to the shiny.host option if it is non-NULL, or "127.0.0.1" otherwise. This means that by default, Shiny applications can only be accessed on the same machine from which they are served. To allow other clients to connect, as in previous versions of Shiny, use "0.0.0.0" (or the IP address of one of your network interfaces, if you care to be explicit about it).
 
@@ -1501,7 +1474,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Dots are now legal characters for inputId/outputId. (Thanks, Kevin Lindquist. #358)
 
 
-# shiny 0.8.0
+shiny 0.8.0
+===========
 
 * Debug hooks are registered on all user-provided functions and (reactive) expressions (e.g., in renderPlot()), which makes it possible to set breakpoints in these functions using the latest version of the RStudio IDE, and the RStudio visual debugging tools can be used to debug Shiny apps. Internally, the registration is done via installExprFunction(), which is a new function introduced in this version to replace exprToFunction() so that the registration can be automatically done.
 
@@ -1520,7 +1494,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * The minimal required version for the httpuv package was increased to 1.2 (on CRAN now).
 
 
-# shiny 0.7.0
+shiny 0.7.0
+===========
 
 * Stopped sending websocket subprotocol. This fixes a compatibility issue with Google Chrome 30.
 
@@ -1549,7 +1524,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add shiny.sharedSecret option, to require the HTTP header Shiny-Shared-Secret to be set to the given value.
 
 
-# shiny 0.6.0
+shiny 0.6.0
+===========
 
 * `tabsetPanel()` can be directed to start with a specific tab selected.
 
@@ -1580,7 +1556,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Shiny apps can be run without a server.r and ui.r file.
 
 
-# shiny 0.5.0
+shiny 0.5.0
+===========
 
 * Switch from websockets package for handling websocket connections to httpuv.
 
@@ -1597,14 +1574,16 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix bug #55, where `renderTable()` would throw error with an empty data frame.
 
 
-# shiny 0.4.1
+shiny 0.4.1
+===========
 
 * Fix bug where width and height weren't passed along properly from `reactivePlot` to `renderPlot`.
 
 * Fix bug where infinite recursion would happen when `reactivePlot` was passed a function for width or height.
 
 
-# shiny 0.4.0
+shiny 0.4.0
+===========
 
 * Added suspend/resume capability to observers.
 
@@ -1619,7 +1598,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fixed a bug where empty values in a numericInput were sent to the R process as 0. They are now sent as NA.
 
 
-# shiny 0.3.1
+shiny 0.3.1
+===========
 
 * Fix issue #91: bug where downloading files did not work.
 
@@ -1628,7 +1608,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Reactive functions now preserve the visible/invisible state of their returned values.
 
 
-# shiny 0.3.0
+shiny 0.3.0
+===========
 
 * Reactive functions are now evaluated lazily.
 
@@ -1653,44 +1634,52 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix issue #64, where pressing Enter in a textbox would cause a form to submit.
 
 
-# shiny 0.2.4
+shiny 0.2.4
+===========
 
 * `runGist` has been updated to use the new download URLs from https://gist.github.com.
 
 * Shiny now uses `CairoPNG()` for output, when the Cairo package is available. This provides better-looking output on Linux and Windows.
 
 
-# shiny 0.2.3
+shiny 0.2.3
+===========
 
 * Ignore request variables for routing purposes
 
 
-# shiny 0.2.2
+shiny 0.2.2
+===========
 
 * Fix CRAN warning (assigning to global environment)
 
 
-# shiny 0.2.1
+shiny 0.2.1
+===========
 
 * [BREAKING] Modify API of `downloadHandler`: The `content` function now takes a file path, not writable connection, as an argument. This makes it much easier to work with APIs that only write to file paths, not connections.
 
 
-# shiny 0.2.0
+shiny 0.2.0
+===========
 
 * Fix subtle name resolution bug--the usual symptom being S4 methods not being invoked correctly when called from inside of ui.R or server.R
 
 
-# shiny 0.1.14
+shiny 0.1.14
+===========
 
 * Fix slider animator, which broke in 0.1.10
 
 
-# shiny 0.1.13
+shiny 0.1.13
+===========
 
 * Fix temp file leak in reactivePlot
 
 
-# shiny 0.1.12
+shiny 0.1.12
+===========
 
 * Fix problems with runGist on Windows
 
@@ -1699,7 +1688,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add CSS hooks for app-wide busy indicators
 
 
-# shiny 0.1.11
+shiny 0.1.11
+===========
 
 * Fix input binding with IE8 on Shiny Server
 
@@ -1708,7 +1698,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Allow dynamic sizing of reactivePlot (i.e. using a function instead of a fixed value)
 
 
-# shiny 0.1.10
+shiny 0.1.10
+===========
 
 * Support more MIME types when serving out of www
 
@@ -1721,7 +1712,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix plot rendering with IE8 on Shiny Server
 
 
-# shiny 0.1.9
+shiny 0.1.9
+===========
 
 * Much less flicker when updating plots
 
@@ -1730,7 +1722,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add `includeText`, `includeHTML`, and `includeMarkdown` functions for putting text, HTML, and Markdown content from external files in the application's UI.
 
 
-# shiny 0.1.8
+shiny 0.1.8
+===========
 
 * Add `runGist` function for conveniently running a Shiny app that is published on gist.github.com.
 
@@ -1743,7 +1736,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add `bootstrapPage` function for creating new Bootstrap based layouts from scratch.
 
 
-# shiny 0.1.7
+shiny 0.1.7
+===========
 
 * Fix issue #26: Shiny.OutputBindings not correctly exported.
 
@@ -1752,7 +1746,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Transcode JSON into UTF-8 (prevents non-ASCII reactivePrint values from causing errors on Windows).
 
 
-# shiny 0.1.6
+shiny 0.1.6
+===========
 
 * Import package dependencies, instead of attaching them (with the exception of websockets, which doesn't currently work unless attached).
 
@@ -1761,7 +1756,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * bindAll was not correctly sending initial values to the server; fixed.
 
 
-# shiny 0.1.5
+shiny 0.1.5
+===========
 
 * BREAKING CHANGE: JS APIs Shiny.bindInput and Shiny.bindOutput removed and replaced with Shiny.bindAll; Shiny.unbindInput and Shiny.unbindOutput removed and replaced with Shiny.unbindAll.
 
@@ -1776,7 +1772,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * htmlOutput (CSS class `shiny-html-output`) can contain inputs and outputs.
 
 
-# shiny 0.1.4
+shiny 0.1.4
+===========
 
 * Allow Bootstrap tabsets to act as reactive inputs; their value indicates which tab is active
 
@@ -1789,7 +1786,8 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Add Shiny.bindInputs(scope), .unbindInputs(scope), .bindOutputs(scope), and .unbindOutputs(scope) JS API calls to allow dynamic binding/unbinding of HTML elements
 
 
-# shiny 0.1.3
+shiny 0.1.3
+===========
 
 * Introduce Shiny.inputBindings.register JS API and InputBinding class, for creating custom input controls
 
@@ -1802,6 +1800,7 @@ Along with the release of Shiny 0.11, we've packaged up some Bootstrap 3 themes
 * Fix issue #10: Plots in tabsets not rendered
 
 
-# shiny 0.1.2
+shiny 0.1.2
+===========
 
 * Initial private beta release!

R/app_template.R

@@ -10,7 +10,8 @@
 #' 2: app.R              : Main application file
 #' 3: R/example.R        : Helper file with R code
 #' 4: R/example-module.R : Example module
-#' 5: tests/testthat/    : Tests using the testthat and shinytest2 package
+#' 5: tests/shinytest/   : Tests using the shinytest package
+#' 6: tests/testthat/    : Tests using the testthat package
 #' ```
 #'
 #' If option 1 is selected, the full example application including the
@@ -23,12 +24,13 @@
 #' |   |- example-module.R
 #' |   `- example.R
 #' `- tests
+#'     |- shinytest.R
+#'     |- shinytest
+#'     |   `- mytest.R
 #'     |- testthat.R
 #'     `- testthat
-#'         |- setup-shinytest2.R
 #'         |- test-examplemodule.R
 #'         |- test-server.R
-#'         |- test-shinytest2.R
 #'         `- test-sort.R
 #' ```
 #'
@@ -43,21 +45,20 @@
 #' * `tests/` contains various tests for the application. You may
 #'   choose to use or remove any of them. They can be executed by the
 #'   [runTests()] function.
+#' * `tests/shinytest.R` is a test runner for test files in the
+#'   `tests/shinytest/` directory.
+#' * `tests/shinytest/mytest.R` is a test that uses the
+#'   [shinytest](https://rstudio.github.io/shinytest/) package to do
+#'   snapshot-based testing.
 #' * `tests/testthat.R` is a test runner for test files in the
-#'   `tests/testthat/` directory using the
-#'   [shinytest2](https://rstudio.github.io/shinytest2/reference/test_app.html)
-#'   package.
-#' * `tests/testthat/setup-shinytest2.R` is setup file to source your `./R` folder into the testing environment.
+#'   `tests/testthat/` directory using the [testthat](https://testthat.r-lib.org/) package.
 #' * `tests/testthat/test-examplemodule.R` is a test for an application's module server function.
 #' * `tests/testthat/test-server.R` is a test for the application's server code
-#' * `tests/testthat/test-shinytest2.R` is a test that uses the
-#'   [shinytest2](https://rstudio.github.io/shinytest2/) package to do
-#'   snapshot-based testing.
 #' * `tests/testthat/test-sort.R` is a test for a supporting function in the `R/` directory.
 #'
 #' @param path Path to create new shiny application template.
 #' @param examples Either one of "default", "ask", "all", or any combination of
-#'   "app", "rdir", "module", and "tests". In an
+#'   "app", "rdir", "module", "shinytest", and "testthat". In an
 #'   interactive session, "default" falls back to "ask"; in a non-interactive
 #'   session, "default" falls back to "all". With "ask", this function will
 #'   prompt the user to select which template items will be added to the new app
@@ -78,19 +79,15 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
   # =======================================================
 
   choices <- c(
-    app    = "app.R              : Main application file",
-    rdir   = "R/example.R        : Helper file with R code",
-    module = "R/example-module.R : Example module",
-    tests  = "tests/testthat/    : Tests using {testthat} and {shinytest2}"
+    app       = "app.R              : Main application file",
+    rdir      = "R/example.R        : Helper file with R code",
+    module    = "R/example-module.R : Example module",
+    shinytest = "tests/shinytest/   : Tests using the shinytest package",
+    testthat  = "tests/testthat/    : Tests using the testthat package"
   )
 
-  # Support legacy value
-  examples[examples == "shinytest"] <- "tests"
-  examples[examples == "testthat"] <- "tests"
-  examples <- unique(examples)
-
   if (identical(examples, "default")) {
-    if (rlang::is_interactive()) {
+    if (interactive()) {
       examples <- "ask"
     } else {
       examples <- "all"
@@ -127,8 +124,18 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
     return(invisible())
   }
 
-  if ("tests" %in% examples) {
-    rlang::check_installed("shinytest2", "for {testthat} tests to work as expected", version = "0.2.0")
+  if ("shinytest" %in% examples) {
+    if (!is_installed("shinytest", "1.4.0"))
+    {
+      message(
+        "The tests/shinytest directory needs shinytest 1.4.0 or later to work properly."
+      )
+      if (is_installed("shinytest")) {
+        message("You currently have shinytest ",
+                get_package_version("shinytest"), " installed.")
+      }
+
+    }
   }
 
   # =======================================================
@@ -201,13 +208,16 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
   }
 
   # Copy the files for a tests/ subdirectory
-  copy_test_dir <- function() {
+  copy_test_dir <- function(name) {
     files <- dir(template_path("tests"), recursive = TRUE)
+    # Note: This is not the same as using dir(pattern = "^shinytest"), since
+    # that will not match files inside of shinytest/.
+    files <- files[grepl(paste0("^", name), files)]
 
     # Filter out files that are not module files in the R directory.
     if (! "rdir" %in% examples) {
       # find all files in the testthat folder that are not module or server files
-      is_r_folder_file <- !grepl("module|server|shinytest2|testthat", basename(files))
+      is_r_folder_file <- (!grepl("module|server", basename(files))) & (dirname(files) == "testthat")
       files <- files[!is_r_folder_file]
     }
 
@@ -272,10 +282,12 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
     copy_file(file.path("R", module_files))
   }
 
-  # tests/testthat dir
-  if ("tests" %in% examples) {
-    copy_test_dir()
+  # tests/ dir
+  if ("shinytest" %in% examples) {
+    copy_test_dir("shinytest")
+  }
+  if ("testthat" %in% examples) {
+    copy_test_dir("testthat")
   }
-
   invisible()
 }

R/bookmark-state.R

@@ -321,38 +321,34 @@ RestoreContext <- R6Class("RestoreContext",
       if (substr(queryString, 1, 1) == '?')
         queryString <- substr(queryString, 2, nchar(queryString))
 
-      # The "=" after "_inputs_" is optional. Shiny doesn't generate URLs with
-      # "=", but httr always adds "=".
-      inputs_reg <- "(^|&)_inputs_=?(&|$)"
-      values_reg <- "(^|&)_values_=?(&|$)"
 
       # Error if multiple '_inputs_' or '_values_'. This is needed because
       # strsplit won't add an entry if the search pattern is at the end of a
       # string.
-      if (length(gregexpr(inputs_reg, queryString)[[1]]) > 1)
+      if (length(gregexpr("(^|&)_inputs_(&|$)", queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_inputs_' found")
-      if (length(gregexpr(values_reg, queryString)[[1]]) > 1)
+      if (length(gregexpr("(^|&)_values_(&|$)", queryString)[[1]]) > 1)
         stop("Invalid state string: more than one '_values_' found")
 
       # Look for _inputs_ and store following content in inputStr
-      splitStr <- strsplit(queryString, inputs_reg)[[1]]
+      splitStr <- strsplit(queryString, "(^|&)_inputs_(&|$)")[[1]]
       if (length(splitStr) == 2) {
         inputStr <- splitStr[2]
         # Remove any _values_ (and content after _values_) that may come after
         # _inputs_
-        inputStr <- strsplit(inputStr, values_reg)[[1]][1]
+        inputStr <- strsplit(inputStr, "(^|&)_values_(&|$)")[[1]][1]
 
       } else {
         inputStr <- ""
       }
 
       # Look for _values_ and store following content in valueStr
-      splitStr <- strsplit(queryString, values_reg)[[1]]
+      splitStr <- strsplit(queryString, "(^|&)_values_(&|$)")[[1]]
       if (length(splitStr) == 2) {
         valueStr <- splitStr[2]
         # Remove any _inputs_ (and content after _inputs_) that may come after
         # _values_
-        valueStr <- strsplit(valueStr, inputs_reg)[[1]][1]
+        valueStr <- strsplit(valueStr, "(^|&)_inputs_(&|$)")[[1]][1]
 
       } else {
         valueStr <- ""
@@ -363,20 +359,16 @@ RestoreContext <- R6Class("RestoreContext",
       values <- parseQueryString(valueStr, nested = TRUE)
 
       valuesFromJSON <- function(vals) {
-        varsUnparsed <- c()
-        valsParsed <- mapply(names(vals), vals, SIMPLIFY = FALSE,
+        mapply(names(vals), vals, SIMPLIFY = FALSE,
           FUN = function(name, value) {
             tryCatch(
               safeFromJSON(value),
               error = function(e) {
-                varsUnparsed <<- c(varsUnparsed, name)
-                warning("Failed to parse URL parameter \"", name, "\"")
+                stop("Failed to parse URL parameter \"", name, "\"")
               }
             )
           }
         )
-        valsParsed[varsUnparsed] <- NULL
-        valsParsed
       }
 
       inputs <- valuesFromJSON(inputs)

R/bootstrap-deprecated.R

@@ -6,7 +6,7 @@
 #' @param sidebarPanel The [sidebarPanel] containing input controls
 #' @param mainPanel The [mainPanel] containing outputs
 #' @keywords internal
-#' @return A UI definition that can be passed to the [shinyUI] function
+#' @return A UI defintion that can be passed to the [shinyUI] function
 #' @export
 pageWithSidebar <- function(headerPanel,
                             sidebarPanel,

R/bootstrap-layout.R

@@ -13,7 +13,7 @@
 #'   Can also be set as a side effect of the [titlePanel()] function.
 #' @inheritParams bootstrapPage
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @return A UI defintion that can be passed to the [shinyUI] function.
 #'
 #' @details To create a fluid page use the `fluidPage` function and include
 #'   instances of `fluidRow` and [column()] within it. As an
@@ -111,7 +111,7 @@ fluidRow <- function(...) {
 #' @param title The browser window title (defaults to the host URL of the page)
 #' @inheritParams bootstrapPage
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @return A UI defintion that can be passed to the [shinyUI] function.
 #'
 #' @details To create a fixed page use the `fixedPage` function and include
 #'   instances of `fixedRow` and [column()] within it. Note that
@@ -516,7 +516,7 @@ splitLayout <- function(..., cellWidths = NULL, cellArgs = list()) {
   children <- children[childIdx]
   count <- length(children)
 
-  if (length(cellWidths) == 0 || isTRUE(is.na(cellWidths))) {
+  if (length(cellWidths) == 0 || is.na(cellWidths)) {
     cellWidths <- sprintf("%.3f%%", 100 / count)
   }
   cellWidths <- rep(cellWidths, length.out = count)

R/bootstrap.R

@@ -24,7 +24,7 @@ NULL
 #'   This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="en">}.
 #'   The default (NULL) results in an empty string.
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @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.
@@ -385,7 +385,7 @@ collapseSizes <- function(padding) {
 #' @inheritParams bootstrapPage
 #' @param icon Optional icon to appear on a `navbarMenu` tab.
 #'
-#' @return A UI definition that can be passed to the [shinyUI] function.
+#' @return A UI defintion that can be passed to the [shinyUI] function.
 #'
 #' @details The `navbarMenu` function can be used to create an embedded
 #'   menu within the navbar that in turns includes additional tabPanels (see
@@ -794,7 +794,7 @@ verbatimTextOutput <- function(outputId, placeholder = FALSE) {
 #' @export
 imageOutput <- function(outputId, width = "100%", height="400px",
                         click = NULL, dblclick = NULL, hover = NULL, brush = NULL,
-                        inline = FALSE, fill = FALSE) {
+                        inline = FALSE) {
 
   style <- if (!inline) {
     # Using `css()` here instead of paste/sprintf so that NULL values will
@@ -850,8 +850,7 @@ imageOutput <- function(outputId, width = "100%", height="400px",
   }
 
   container <- if (inline) span else div
-  res <- do.call(container, args)
-  bindFillRole(res, item = fill)
+  do.call(container, args)
 }
 
 #' Create an plot or image output element
@@ -919,11 +918,6 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #'   `imageOutput`/`plotOutput` calls may share the same `id`
 #'   value; brushing one image or plot will cause any other brushes with the
 #'   same `id` to disappear.
-#' @param fill Whether or not the returned tag should be treated as a fill item,
-#'   meaning that its `height` is allowed to grow/shrink to fit a fill container
-#'   with an opinionated height (see [htmltools::bindFillRole()]) with an
-#'   opinionated height. Examples of fill containers include `bslib::card()` and
-#'   `bslib::card_body_fill()`.
 #' @inheritParams textOutput
 #' @note The arguments `clickId` and `hoverId` only work for R base graphics
 #'   (see the \pkg{\link[graphics:graphics-package]{graphics}} package). They do
@@ -1094,11 +1088,11 @@ imageOutput <- function(outputId, width = "100%", height="400px",
 #' @export
 plotOutput <- function(outputId, width = "100%", height="400px",
                        click = NULL, dblclick = NULL, hover = NULL, brush = NULL,
-                       inline = FALSE, fill = !inline) {
+                       inline = FALSE) {
 
   # Result is the same as imageOutput, except for HTML class
   res <- imageOutput(outputId, width, height, click, dblclick,
-                     hover, brush, inline, fill)
+                     hover, brush, inline)
 
   res$attribs$class <- "shiny-plot-output"
   res
@@ -1141,21 +1135,15 @@ dataTableOutput <- function(outputId) {
 #' Create an HTML output element
 #'
 #' Render a reactive output variable as HTML within an application page. The
-#' text will be included within an HTML `div` tag, and is presumed to contain
-#' HTML content which should not be escaped.
+#' text will be included within an HTML `div` tag, and is presumed to
+#' contain HTML content which should not be escaped.
 #'
-#' `uiOutput` is intended to be used with `renderUI` on the server side. It is
-#' currently just an alias for `htmlOutput`.
+#' `uiOutput` is intended to be used with `renderUI` on the server
+#' side. It is currently just an alias for `htmlOutput`.
 #'
 #' @param outputId output variable to read the value from
 #' @param ... Other arguments to pass to the container tag function. This is
 #'   useful for providing additional classes for the tag.
-#' @param fill If `TRUE`, the result of `container` is treated as _both_ a fill
-#'   item and container (see [htmltools::bindFillRole()]), which means both the
-#'   `container` as well as its immediate children (i.e., the result of
-#'   `renderUI()`) are allowed to grow/shrink to fit a fill container with an
-#'   opinionated height. Set `fill = "item"` or `fill = "container"` to treat
-#'   `container` as just a fill item or a fill container.
 #' @inheritParams textOutput
 #' @return An HTML output element that can be included in a panel
 #' @examples
@@ -1167,16 +1155,12 @@ dataTableOutput <- function(outputId) {
 #' )
 #' @export
 htmlOutput <- function(outputId, inline = FALSE,
-  container = if (inline) span else div, fill = FALSE, ...)
+  container = if (inline) span else div, ...)
 {
   if (any_unnamed(list(...))) {
     warning("Unnamed elements in ... will be replaced with dynamic UI.")
   }
-  res <- container(id = outputId, class = "shiny-html-output", ...)
-  bindFillRole(
-    res, item = isTRUE(fill) || isTRUE("item" == fill),
-    container = isTRUE(fill) || isTRUE("container" == fill)
-  )
+  container(id = outputId, class="shiny-html-output", ...)
 }
 
 #' @rdname htmlOutput

R/conditions.R

@@ -421,17 +421,8 @@ pruneStackTrace <- function(parents) {
   # Loop over the parent indices. Anything that is not parented by current_node
   # (a.k.a. last-known-good node), or is a dupe, can be discarded. Anything that
   # is kept becomes the new current_node.
-  #
-  # jcheng 2022-03-18: Two more reasons a node can be kept:
-  #   1. parent is 0
-  #   2. parent is i
-  # Not sure why either of these situations happen, but they're common when
-  # interacting with rlang/dplyr errors. See issue rstudio/shiny#3250 for repro
-  # cases.
   include <- vapply(seq_along(parents), function(i) {
-    if ((!is_dupe[[i]] && parents[[i]] == current_node) ||
-        parents[[i]] == 0 ||
-        parents[[i]] == i) {
+    if (!is_dupe[[i]] && parents[[i]] == current_node) {
       current_node <<- i
       TRUE
     } else {

R/devmode.R

@@ -1,6 +1,6 @@
 #' Shiny Developer Mode
 #'
-#' @description `r lifecycle::badge("experimental")`
+#' @description \lifecycle{experimental}
 #'
 #'   Developer Mode enables a number of [options()] to make a developer's life
 #'   easier, like enabling non-minified JS and printing messages about

R/imageutils.R

@@ -1,23 +1,22 @@
 startPNG <- function(filename, width, height, res, ...) {
-  pngfun <- if ((getOption('shiny.useragg') %||% TRUE) && is_installed("ragg")) {
-    ragg::agg_png
+  # shiny.useragg is an experimental option that isn't officially supported or
+  # documented. It's here in the off chance that someone really wants
+  # to use ragg (say, instead of showtext, for custom font rendering).
+  # In the next shiny release, this option will likely be superseded in
+  # favor of a fully customizable graphics device option
+  if ((getOption('shiny.useragg') %||% FALSE) && is_installed("ragg")) {
+    pngfun <- ragg::agg_png
   } else if (capabilities("aqua")) {
     # i.e., png(type = 'quartz')
-    grDevices::png
+    pngfun <- grDevices::png
   } else if ((getOption('shiny.usecairo') %||% TRUE) && is_installed("Cairo")) {
-    Cairo::CairoPNG
+    pngfun <- Cairo::CairoPNG
   } else {
     # i.e., png(type = 'cairo')
-    grDevices::png
+    pngfun <- grDevices::png
   }
 
-  args <- list2(filename = filename, width = width, height = height, res = res, ...)
-
-  # It's possible for width/height to be NULL/numeric(0) (e.g., when using
-  # suspendWhenHidden=F w/ tabsetPanel(), see rstudio/shiny#1409), so when
-  # this happens let the device determine what the default size should be.
-  if (length(args$width) == 0) args$width <- NULL
-  if (length(args$height) == 0) args$height <- NULL
+  args <- rlang::list2(filename=filename, width=width, height=height, res=res, ...)
 
   # Set a smarter default for the device's bg argument (based on thematic's global state).
   # Note that, technically, this is really only needed for CairoPNG, since the other
@@ -58,35 +57,33 @@ startPNG <- function(filename, width, height, res, ...) {
   grDevices::dev.cur()
 }
 
-#' Capture a plot as a PNG file.
+#' Run a plotting function and save the output as a PNG
 #'
-#' The PNG graphics device used is determined in the following order:
-#'   * If the ragg package is installed (and the `shiny.useragg` is not
-#'    set to `FALSE`), then use [ragg::agg_png()].
-#'   * If a quartz device is available (i.e., `capabilities("aqua")` is
-#'    `TRUE`), then use `png(type = "quartz")`.
-#'   * If the Cairo package is installed (and the `shiny.usecairo` option
-#'    is not set to `FALSE`), then use [Cairo::CairoPNG()].
-#'   * Otherwise, use [grDevices::png()]. In this case, Linux and Windows
-#'    may not antialias some point shapes, resulting in poor quality output.
+#' This function returns the name of the PNG file that it generates. In
+#' essence, it calls `png()`, then `func()`, then `dev.off()`.
+#' So `func` must be a function that will generate a plot when used this
+#' way.
 #'
-#' @details
-#'   A `NULL` value provided to `width` or `height` is ignored (i.e., the
-#'   default `width` or `height` of the graphics device is used).
+#' For output, it will try to use the following devices, in this order:
+#' quartz (via [grDevices::png()]), then [Cairo::CairoPNG()],
+#' and finally [grDevices::png()]. This is in order of quality of
+#' output. Notably, plain `png` output on Linux and Windows may not
+#' antialias some point shapes, resulting in poor quality output.
+#'
+#' In some cases, `Cairo()` provides output that looks worse than
+#' `png()`. To disable Cairo output for an app, use
+#' `options(shiny.usecairo=FALSE)`.
 #'
 #' @param func A function that generates a plot.
 #' @param filename The name of the output file. Defaults to a temp file with
 #'   extension `.png`.
 #' @param width Width in pixels.
 #' @param height Height in pixels.
-#' @param res Resolution in pixels per inch. This value is passed to the
-#'   graphics device. Note that this affects the resolution of PNG rendering in
+#' @param res Resolution in pixels per inch. This value is passed to
+#'   [grDevices::png()]. Note that this affects the resolution of PNG rendering in
 #'   R; it won't change the actual ppi of the browser.
-#' @param ... Arguments to be passed through to the graphics device. These can
-#'   be used to set the width, height, background color, etc.
-#'
-#' @return A path to the newly generated PNG file.
-#'
+#' @param ... Arguments to be passed through to [grDevices::png()].
+#'   These can be used to set the width, height, background color, etc.
 #' @export
 plotPNG <- function(func, filename=tempfile(fileext='.png'),
                     width=400, height=400, res=72, ...) {

R/input-file.R

@@ -23,18 +23,7 @@
 #' @param buttonLabel The label used on the button. Can be text or an HTML tag
 #'   object.
 #' @param placeholder The text to show before a file has been uploaded.
-#' @param capture What source to use for capturing image, audio or video data.
-#'   This attribute facilitates user access to a device's media capture 
-#'   mechanism, such as a camera, or microphone, from within a file upload 
-#'   control.
 #'
-#'   A value of `user` indicates that the user-facing camera and/or microphone
-#'   should be used. A value of `environment` specifies that the outward-facing
-#'   camera and/or microphone should be used.
-#'
-#'   By default on most phones, this will accept still photos or video. For
-#'   still photos only, also use `accept="image/*"`. For video only, use
-#'   `accept="video/*"`.
 #' @examples
 #' ## Only run examples in interactive R sessions
 #' if (interactive()) {
@@ -84,8 +73,7 @@
 #'
 #' @export
 fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
-  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected",
-  capture = NULL) {
+  width = NULL, buttonLabel = "Browse...", placeholder = "No file selected") {
 
   restoredValue <- restoreInput(id = inputId, default = NULL)
 
@@ -113,9 +101,6 @@ fileInput <- function(inputId, label, multiple = FALSE, accept = NULL,
   if (length(accept) > 0)
     inputTag$attribs$accept <- paste(accept, collapse=',')
 
-  if (!is.null(capture)) {
-    inputTag$attribs$capture <- capture
-  }
 
   div(class = "form-group shiny-input-container",
     style = css(width = validateCssUnit(width)),

R/jqueryui.R

@@ -103,10 +103,10 @@ fixedPanel <- function(...,
 
 jqueryuiDependency <- function() {
   htmlDependency(
-    "jqueryui",
-    version_jqueryui,
-    src = "www/shared/jqueryui",
-    package = "shiny",
-    script = "jquery-ui.min.js"
+    'jqueryui',
+    '1.12.1',
+    src = 'www/shared/jqueryui',
+    package = 'shiny',
+    script = 'jquery-ui.min.js'
   )
 }

R/modal.R

@@ -43,10 +43,7 @@ removeModal <- function(session = getDefaultReactiveDomain()) {
 #' @param title An optional title for the dialog.
 #' @param footer UI for footer. Use `NULL` for no footer.
 #' @param size One of `"s"` for small, `"m"` (the default) for medium,
-#'   `"l"` for large, or `"xl"` for extra large. Note that `"xl"` only 
-#'    works with Bootstrap 4 and above (to opt-in to Bootstrap 4+, 
-#'    pass [bslib::bs_theme()] to the `theme` argument of a page container 
-#'    like [fluidPage()]).
+#'   or `"l"` for large.
 #' @param easyClose If `TRUE`, the modal dialog can be dismissed by
 #'   clicking outside the dialog box, or be pressing the Escape key. If
 #'   `FALSE` (the default), the modal dialog can't be dismissed in those

R/reactives.R

@@ -2472,11 +2472,11 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
 
       # Ensure r() is called only after setting firstRun to FALSE since r()
       # may throw an error
-      try(r(), silent = TRUE)
+      r()
       return()
     }
     # This ensures r() is still tracked after firstRun
-    try(r(), silent = TRUE)
+    r()
 
     # The value (or possibly millis) changed. Start or reset the timer.
     v$when <- getDomainTimeMs(domain) + millis()
@@ -2509,7 +2509,7 @@ debounce <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
   # commenting it out and studying the unit test failure that results.
   primer <- observe({
     primer$destroy()
-    try(er(), silent = TRUE)
+    er()
   }, label = "debounce primer", domain = domain, priority = priority)
 
   er
@@ -2551,7 +2551,7 @@ throttle <- function(r, millis, priority = 100, domain = getDefaultReactiveDomai
   }
 
   # Responsible for tracking when f() changes.
-  observeEvent(try(r(), silent = TRUE), {
+  observeEvent(r(), {
     if (v$pending) {
       # In a blackout period and someone already scheduled; do nothing
     } else if (blackoutMillisLeft() > 0) {

R/render-plot.R

@@ -34,7 +34,7 @@
 #'   When rendering an inline plot, you must provide numeric values (in pixels)
 #'   to both \code{width} and \code{height}.
 #' @param res Resolution of resulting plot, in pixels per inch. This value is
-#'   passed to [plotPNG()]. Note that this affects the resolution of PNG
+#'   passed to [grDevices::png()]. Note that this affects the resolution of PNG
 #'   rendering in R; it won't change the actual ppi of the browser.
 #' @param alt Alternate text for the HTML `<img>` tag if it cannot be displayed
 #'   or viewed (i.e., the user uses a screen reader). In addition to a character
@@ -44,7 +44,7 @@
 #'   ggplot objects; for other plots, `NA` results in alt text of "Plot object".
 #'   `NULL` or `""` is not recommended because those should be limited to
 #'   decorative images.
-#' @param ... Arguments to be passed through to [plotPNG()].
+#' @param ... Arguments to be passed through to [grDevices::png()].
 #'   These can be used to set the width, height, background color, etc.
 #' @inheritParams renderUI
 #' @param execOnResize If `FALSE` (the default), then when a plot is
@@ -194,8 +194,8 @@ renderPlot <- function(expr, width = 'auto', height = 'auto', res = 72, ...,
 }
 
 resizeSavedPlot <- function(name, session, result, width, height, alt, pixelratio, res, ...) {
-  if (isTRUE(result$img$width == width && result$img$height == height &&
-      result$pixelratio == pixelratio && result$res == res)) {
+  if (result$img$width == width && result$img$height == height &&
+      result$pixelratio == pixelratio && result$res == res) {
     return(result)
   }
 

R/server.R

@@ -29,7 +29,7 @@ registerClient <- function(client) {
 
 #' Define Server Functionality
 #'
-#' @description `r lifecycle::badge("superseded")`
+#' @description \lifecycle{superseded}
 #'
 #' @description Defines the server-side logic of the Shiny application. This generally
 #' involves creating functions that map user inputs to various kinds of output.
@@ -49,7 +49,7 @@ registerClient <- function(client) {
 #' optional `session` parameter, which is used when greater control is
 #' needed.
 #'
-#' See the [tutorial](https://shiny.rstudio.com/tutorial/) for more
+#' See the [tutorial](https://rstudio.github.io/shiny/tutorial/) for more
 #' on how to write a server function.
 #'
 #' @param func The server function for this application. See the details section
@@ -331,7 +331,7 @@ argsForServerFunc <- function(serverFunc, session) {
 getEffectiveBody <- function(func) {
   if (is.null(func))
     NULL
-  else if (isS4(func) && inherits(func, "functionWithTrace"))
+  else if (isS4(func) && class(func) == "functionWithTrace")
     body(func@original)
   else
     body(func)

R/shiny-options.R

@@ -94,10 +94,6 @@ getShinyOption <- function(name, default = NULL) {
 #'   numbers to JSON format to send to the client web browser.}
 #' \item{shiny.launch.browser (defaults to `interactive()`)}{A boolean which controls the default behavior
 #'   when an app is run. See [runApp()] for more information.}
-#' \item{shiny.mathjax.url (defaults to `"https://mathjax.rstudio.com/latest/MathJax.js"`)}{
-#'   The URL that should be used to load MathJax, via [withMathJax()].}
-#' \item{shiny.mathjax.config (defaults to `"config=TeX-AMS-MML_HTMLorMML"`)}{The querystring
-#'   used to load MathJax, via [withMathJax()].}
 #' \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
 #'   web request size, which serves as a size limit for file uploads.}
 #' \item{shiny.minified (defaults to `TRUE`)}{By default
@@ -140,10 +136,9 @@ getShinyOption <- function(name, default = NULL) {
 #'   messages).}
 #' \item{shiny.autoload.r (defaults to `TRUE`)}{If `TRUE`, then the R/
 #'   of a shiny app will automatically be sourced.}
-#' \item{shiny.useragg (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
-#'   ragg package. See [plotPNG()] for more information.}
-#' \item{shiny.usecairo (defaults to `TRUE`)}{Set to `FALSE` to prevent PNG rendering via the
-#'   Cairo package. See [plotPNG()] for more information.}
+#' \item{shiny.usecairo (defaults to `TRUE`)}{This is used to disable graphical rendering by the
+#'   Cairo package, if it is installed. See [plotPNG()] for more
+#'   information.}
 #' \item{shiny.devmode (defaults to `NULL`)}{Option to enable Shiny Developer Mode. When set,
 #'   different default `getOption(key)` values will be returned. See [devmode()] for more details.}
 ### Not documenting as 'shiny.devmode.verbose' is for niche use only

R/shiny.R

@@ -185,11 +185,9 @@ workerId <- local({
 #'   session is actually connected.
 #' }
 #' \item{request}{
-#'   An environment that implements the [Rook
-#'   specification](https://github.com/jeffreyhorner/Rook#the-environment) for
-#'   HTTP requests. This is the request that was used to initiate the websocket
-#'   connection (as opposed to the request that downloaded the web page for the
-#'   app).
+#'   An environment that implements the Rook specification for HTTP requests.
+#'   This is the request that was used to initiate the websocket connection
+#'   (as opposed to the request that downloaded the web page for the app).
 #' }
 #' \item{userData}{
 #'   An environment for app authors and module/package authors to store whatever
@@ -1876,26 +1874,6 @@ ShinySession <- R6Class(
     # Provides a mechanism for handling direct HTTP requests that are posted
     # to the session (rather than going through the websocket)
     handleRequest = function(req) {
-      if (!is.null(self$user)) {
-        if (is.null(req$HTTP_SHINY_SERVER_CREDENTIALS)) {
-          # Session owner is logged in, but this requester is not
-          return(NULL)
-        }
-
-        requestUser <- NULL
-        try(
-          {
-            creds <- safeFromJSON(req$HTTP_SHINY_SERVER_CREDENTIALS)
-            requestUser <- creds$user
-          },
-          silent = TRUE
-        )
-        if (!identical(self$user, requestUser)) {
-          # This requester is not the same user as session owner
-          return(NULL)
-        }
-      }
-
       # TODO: Turn off caching for the response
       subpath <- req$PATH_INFO
 

R/shinyapp.R

@@ -286,7 +286,7 @@ shinyAppDir_serverR <- function(appDir, options=list()) {
 #
 # The return value is a function that halts monitoring when called.
 initAutoReloadMonitor <- function(dir) {
-  if (!get_devmode_option("shiny.autoreload", FALSE)) {
+  if (!getOption("shiny.autoreload", FALSE)) {
     return(function(){})
   }
 
@@ -339,7 +339,7 @@ initAutoReloadMonitor <- function(dir) {
 #' @param appDir The application directory. If `appDir` is `NULL` or
 #'   not supplied, the nearest enclosing directory that is a Shiny app, starting
 #'   with the current directory, is used.
-#' @param renv The environment in which the files in the `R/` directory should
+#' @param renv The environmeny in which the files in the `R/` directory should
 #'   be evaluated.
 #' @param globalrenv The environment in which `global.R` should be evaluated. If
 #'   `NULL`, `global.R` will not be evaluated at all.

R/shinyui.R

@@ -14,11 +14,7 @@ NULL
 #' # now we can just write "static" content without withMathJax()
 #' div("more math here $$\\sqrt{2}$$")
 withMathJax <- function(...) {
-  path <- paste0(
-    getOption("shiny.mathjax.url", "https://mathjax.rstudio.com/latest/MathJax.js"),
-    "?",
-    getOption("shiny.mathjax.config", "config=TeX-AMS-MML_HTMLorMML")
-  )
+  path <- 'https://mathjax.rstudio.com/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
   tagList(
     tags$head(
       singleton(tags$script(src = path, type = 'text/javascript'))
@@ -148,7 +144,7 @@ shinyDependencyCSS <- function(theme) {
 
 #' Create a Shiny UI handler
 #'
-#' @description `r lifecycle::badge("superseded")`
+#' @description \lifecycle{superseded}
 #'
 #' @description Historically this function was used in ui.R files to register a user
 #' interface with Shiny. It is no longer required as of Shiny 0.10; simply

R/shinywrappers.R

@@ -778,9 +778,9 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #'   function.)
 #' @param contentType A string of the download's
 #'   [content type](https://en.wikipedia.org/wiki/Internet_media_type), for
-#'   example `"text/csv"` or `"image/png"`. If `NULL`, the content type 
-#'   will be guessed based on the filename extension, or 
-#'   `application/octet-stream` if the extension is unknown.
+#'   example `"text/csv"` or `"image/png"`. If `NULL` or
+#'   `NA`, the content type will be guessed based on the filename
+#'   extension, or `application/octet-stream` if the extension is unknown.
 #' @param outputArgs A list of arguments to be passed through to the implicit
 #'   call to [downloadButton()] when `downloadHandler` is used
 #'   in an interactive R Markdown document.
@@ -810,7 +810,7 @@ renderUI <- function(expr, env = parent.frame(), quoted = FALSE,
 #' shinyApp(ui, server)
 #' }
 #' @export
-downloadHandler <- function(filename, content, contentType=NULL, outputArgs=list()) {
+downloadHandler <- function(filename, content, contentType=NA, outputArgs=list()) {
   renderFunc <- function(shinysession, name, ...) {
     shinysession$registerDownload(name, filename, contentType, content)
   }

R/version_jqueryui.R

@@ -1,2 +0,0 @@
-# Generated by tools/updatejQueryUI.R; do not edit by hand
-version_jqueryui <- "1.13.2"

README.md

@@ -16,7 +16,7 @@ Easily build rich and productive interactive web apps in R — no HTML/CSS/J
 * A prebuilt set of highly sophisticated, customizable, and easy-to-use widgets (e.g., plots, tables, sliders, dropdowns, date pickers, and more).
 * An attractive default look based on [Bootstrap](https://getbootstrap.com/) which can also be easily customized with the [bslib](https://github.com/rstudio/bslib) package or avoided entirely with more direct R bindings to HTML/CSS/JavaScript.
 * Seamless integration with [R Markdown](https://shiny.rstudio.com/articles/interactive-docs.html), making it easy to embed numerous applications natively within a larger dynamic document.
-* Tools for improving and monitoring performance, including native support for [async programming](https://www.rstudio.com/blog/shiny-1-1-0/), [caching](https://talks.cpsievert.me/20201117), [load testing](https://rstudio.github.io/shinyloadtest/), and more.
+* Tools for improving and monitoring performance, including native support for [async programming](https://blog.rstudio.com/2018/06/26/shiny-1-1-0/), [caching](https://talks.cpsievert.me/20201117), [load testing](https://rstudio.github.io/shinyloadtest/), and [more](https://support.rstudio.com/hc/en-us/articles/231874748-Scaling-and-Performance-Tuning-in-RStudio-Connect).
 * [Modules](https://shiny.rstudio.com/articles/modules.html): a framework for reducing code duplication and complexity.
 * An ability to [bookmark application state](https://shiny.rstudio.com/articles/bookmarking-state.html) and/or [generate code to reproduce output(s)](https://github.com/rstudio/shinymeta).
 * A rich ecosystem of extension packages for more [custom widgets](http://www.htmlwidgets.org/), [input validation](https://github.com/rstudio/shinyvalidate), [unit testing](https://github.com/rstudio/shinytest), and more.

inst/app_template/tests/shinytest.R

@@ -0,0 +1,2 @@
+library(shinytest)
+expect_pass(testApp("../", suffix = osName()))

inst/app_template/tests/shinytest/mytest.R

@@ -0,0 +1,12 @@
+app <- ShinyDriver$new("../../")
+app$snapshotInit("mytest")
+
+app$snapshot()
+{{
+if (isTRUE(module)) {
+'
+app$setInputs(`examplemodule1-button` = "click")
+app$setInputs(`examplemodule1-button` = "click")
+app$snapshot()'
+}
+}}

inst/app_template/tests/testthat.R

@@ -1 +1,9 @@
-shinytest2::test_app()
+library(testthat)
+
+test_dir(
+  "./testthat",
+  # Run in the app's environment containing all support methods.
+  env = shiny::loadSupport(),
+  # Display the regular progress output and throw an error if any test error is found
+  reporter = c("progress", "fail")
+)

inst/app_template/tests/testthat/setup-shinytest2.R

@@ -1,2 +0,0 @@
-# Load application support files into testing environment
-shinytest2::load_app_env()

inst/app_template/tests/testthat/test-server.R

@@ -14,4 +14,5 @@ if (isTRUE(rdir)) {
   expect_equal(output$sequence, "1 2 3 4 5 6 7 8 9 10 11 12")
 '
 }
-}}})
+}}
+})

inst/app_template/tests/testthat/test-shinytest2.R

@@ -1,18 +0,0 @@
-library(shinytest2)
-
-test_that("Initial snapshot values are consistent", {
-  app <- AppDriver$new(name = "init")
-  app$expect_values()
-}){{
-if (isTRUE(module)) {
-HTML('
-
-
-test_that("Module values are consistent", {
-  app <- AppDriver$new(name = "mod")
-  app$click("examplemodule1-button")
-  app$click("examplemodule1-button")
-  app$expect_values()
-})')
-}
-}}

inst/www/shared/jqueryui/AUTHORS.txt

@@ -312,7 +312,7 @@ Mani Mishra <manimishra902@gmail.com>
 Hannah Methvin <hannahmethvin@gmail.com>
 Leonardo Balter <leonardo.balter@gmail.com>
 Benjamin Albert <benjamin_a5@yahoo.com>
-Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
+Michał Gołębiowski <m.goleb@gmail.com>
 Alyosha Pushak <alyosha.pushak@gmail.com>
 Fahad Ahmad <fahadahmad41@hotmail.com>
 Matt Brundage <github@mattbrundage.com>
@@ -331,42 +331,3 @@ Peter Dave Hello <hsu@peterdavehello.org>
 Johannes Schäfer <johnschaefer@gmx.de>
 Ville Skyttä <ville.skytta@iki.fi>
 Ryan Oriecuia <ryan.oriecuia@visioncritical.com>
-Sergei Ratnikov <sergeir82@gmail.com>
-milk54 <milk851@gmail.com>
-Evelyn Masso <evoutofambit@gmail.com>
-Robin <mail@robin-fowler.com>
-Simon Asika <asika32764@gmail.com>
-Kevin Cupp <kevin.cupp@gmail.com>
-Jeremy Mickelson <Jeremy.Mickelson@gmail.com>
-Kyle Rosenberg <kyle.rosenberg@gmail.com>
-Petri Partio <petri.partio@gmail.com>
-pallxk <github@pallxk.com>
-Luke Brookhart <luke@onjax.com>
-claudi <hirt-claudia@gmx.de>
-Eirik Sletteberg <eiriksletteberg@gmail.com>
-Albert Johansson <albert@intervaro.se>
-A. Wells <borgboyone@users.noreply.github.com>
-Robert Brignull <robertbrignull@gmail.com>
-Horus68 <pauloizidoro@gmail.com>
-Maksymenkov Eugene <foatei@gmail.com>
-OskarNS <soerensen.oskar@gmail.com>
-Gez Quinn <holla@gezquinn.design>
-jigar gala <jigar.gala140291@gmail.com>
-Florian Wegscheider <flo.wegscheider@gmail.com>
-Fatér Zsolt <fater.zsolt@gmail.com>
-Szabolcs Szabolcsi-Toth <nec@shell8.net>
-Jérémy Munsch <github@jeremydev.ovh>
-Hrvoje Novosel <hrvoje.novosel@gmail.com>
-Paul Capron <PaulCapron@users.noreply.github.com>
-Micah Miller <mikhey@runbox.com>
-sakshi87 <53863764+sakshi87@users.noreply.github.com>
-Mikolaj Wolicki <wolicki.mikolaj@gmail.com>
-Patrick McKay <patrick.mckay@vumc.org>
-c-lambert <58025159+c-lambert@users.noreply.github.com>
-Josep Sanz <josepsanzcamp@gmail.com>
-Ben Mullins <benm@umich.edu>
-Christian Oliff <christianoliff@pm.me>
-dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
-Adam Lidén Hällgren <adamlh92@gmail.com>
-James Hinderks <hinderks@gmail.com>
-Denny Septian Panggabean <97607754+ddevsr@users.noreply.github.com>

inst/www/shared/jqueryui/README

@@ -0,0 +1,5 @@
+This a full jQuery UI build, downloaded from:
+https://jqueryui.com/resources/download/jquery-ui-1.12.1.zip
+
+The copy of jQuery that is bundled with the download, under external/, is not
+included because Shiny already has its own copy of jQuery.

inst/www/shared/jqueryui/index.html

@@ -58,6 +58,7 @@
 
 <h1>YOUR COMPONENTS:</h1>
 
+
 <!-- Accordion -->
 <h2 class="demoHeaders">Accordion</h2>
 <div id="accordion">
@@ -69,17 +70,23 @@
 	<div>Nam dui erat, auctor a, dignissim quis.</div>
 </div>
 
+
+
 <!-- Autocomplete -->
 <h2 class="demoHeaders">Autocomplete</h2>
 <div>
 	<input id="autocomplete" title="type &quot;a&quot;">
 </div>
 
+
+
 <!-- Button -->
 <h2 class="demoHeaders">Button</h2>
 <button id="button">A button element</button>
 <button id="button-icon">An icon-only button</button>
 
+
+
 <!-- Checkboxradio -->
 <h2 class="demoHeaders">Checkboxradio</h2>
 <form style="margin-top: 1em;">
@@ -90,6 +97,8 @@
 	</div>
 </form>
 
+
+
 <!-- Controlgroup -->
 <h2 class="demoHeaders">Controlgroup</h2>
 <fieldset>
@@ -116,6 +125,8 @@
 	</div>
 </fieldset>
 
+
+
 <!-- Tabs -->
 <h2 class="demoHeaders">Tabs</h2>
 <div id="tabs">
@@ -129,6 +140,8 @@
 	<div id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
 </div>
 
+
+
 <h2 class="demoHeaders">Dialog</h2>
 <p>
 	<button id="dialog-link" class="ui-button ui-corner-all ui-widget">
@@ -154,6 +167,7 @@
 </div>
 
 
+
 <h2 class="demoHeaders">Framework Icons (content color preview)</h2>
 <ul id="icons" class="ui-widget ui-helper-clearfix">
 	<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
@@ -331,18 +345,25 @@
 	<li class="ui-state-default ui-corner-all" title=".ui-icon-grip-diagonal-se"><span class="ui-icon ui-icon-grip-diagonal-se"></span></li>
 </ul>
 
+
 <!-- Slider -->
 <h2 class="demoHeaders">Slider</h2>
 <div id="slider"></div>
 
+
+
 <!-- Datepicker -->
 <h2 class="demoHeaders">Datepicker</h2>
 <div id="datepicker"></div>
 
+
+
 <!-- Progressbar -->
 <h2 class="demoHeaders">Progressbar</h2>
 <div id="progressbar"></div>
 
+
+
 <!-- Progressbar -->
 <h2 class="demoHeaders">Selectmenu</h2>
 <select id="selectmenu">
@@ -353,10 +374,14 @@
 	<option>Faster</option>
 </select>
 
+
+
 <!-- Spinner -->
 <h2 class="demoHeaders">Spinner</h2>
 <input id="spinner">
 
+
+
 <!-- Menu -->
 <h2 class="demoHeaders">Menu</h2>
 <ul style="width:100px;" id="menu">
@@ -375,6 +400,8 @@
 	<li><div>Item 5</div></li>
 </ul>
 
+
+
 <!-- Tooltip -->
 <h2 class="demoHeaders">Tooltip</h2>
 <p id="tooltip">
@@ -382,6 +409,7 @@
 the element with your mouse, the title attribute is displayed in a little box next to the element, just like a native tooltip.
 </p>
 
+
 <!-- Highlight / Error -->
 <h2 class="demoHeaders">Highlight / Error</h2>
 <div class="ui-widget">
@@ -401,8 +429,11 @@ the element with your mouse, the title attribute is displayed in a little box ne
 <script src="external/jquery/jquery.js"></script>
 <script src="jquery-ui.js"></script>
 <script>
+
 $( "#accordion" ).accordion();
 
+
+
 var availableTags = [
 	"ActionScript",
 	"AppleScript",
@@ -431,18 +462,28 @@ $( "#autocomplete" ).autocomplete({
 	source: availableTags
 });
 
+
+
 $( "#button" ).button();
 $( "#button-icon" ).button({
 	icon: "ui-icon-gear",
 	showLabel: false
 });
 
+
+
 $( "#radioset" ).buttonset();
 
+
+
 $( "#controlgroup" ).controlgroup();
 
+
+
 $( "#tabs" ).tabs();
 
+
+
 $( "#dialog" ).dialog({
 	autoOpen: false,
 	width: 400,
@@ -468,27 +509,42 @@ $( "#dialog-link" ).click(function( event ) {
 	event.preventDefault();
 });
 
+
+
 $( "#datepicker" ).datepicker({
 	inline: true
 });
 
+
+
 $( "#slider" ).slider({
 	range: true,
 	values: [ 17, 67 ]
 });
 
+
+
 $( "#progressbar" ).progressbar({
 	value: 20
 });
 
+
+
 $( "#spinner" ).spinner();
 
+
+
 $( "#menu" ).menu();
 
+
+
 $( "#tooltip" ).tooltip();
 
+
+
 $( "#selectmenu" ).selectmenu();
 
+
 // Hover states on the static widgets
 $( "#dialog-link, #icons li" ).hover(
 	function() {

inst/www/shared/jqueryui/jquery-ui.css

@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.13.2 - 2022-07-14
+/*! jQuery UI - v1.12.1 - 2016-09-14
 * http://jqueryui.com
 * Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
 * To view and modify this theme, visit http://jqueryui.com/themeroller/?bgShadowXPos=&bgOverlayXPos=&bgErrorXPos=&bgHighlightXPos=&bgContentXPos=&bgHeaderXPos=&bgActiveXPos=&bgHoverXPos=&bgDefaultXPos=&bgShadowYPos=&bgOverlayYPos=&bgErrorYPos=&bgHighlightYPos=&bgContentYPos=&bgHeaderYPos=&bgActiveYPos=&bgHoverYPos=&bgDefaultYPos=&bgShadowRepeat=&bgOverlayRepeat=&bgErrorRepeat=&bgHighlightRepeat=&bgContentRepeat=&bgHeaderRepeat=&bgActiveRepeat=&bgHoverRepeat=&bgDefaultRepeat=&iconsHover=url(%22images%2Fui-icons_555555_256x240.png%22)&iconsHighlight=url(%22images%2Fui-icons_777620_256x240.png%22)&iconsHeader=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsError=url(%22images%2Fui-icons_cc0000_256x240.png%22)&iconsDefault=url(%22images%2Fui-icons_777777_256x240.png%22)&iconsContent=url(%22images%2Fui-icons_444444_256x240.png%22)&iconsActive=url(%22images%2Fui-icons_ffffff_256x240.png%22)&bgImgUrlShadow=&bgImgUrlOverlay=&bgImgUrlHover=&bgImgUrlHighlight=&bgImgUrlHeader=&bgImgUrlError=&bgImgUrlDefault=&bgImgUrlContent=&bgImgUrlActive=&opacityFilterShadow=Alpha(Opacity%3D30)&opacityFilterOverlay=Alpha(Opacity%3D30)&opacityShadowPerc=30&opacityOverlayPerc=30&iconColorHover=%23555555&iconColorHighlight=%23777620&iconColorHeader=%23444444&iconColorError=%23cc0000&iconColorDefault=%23777777&iconColorContent=%23444444&iconColorActive=%23ffffff&bgImgOpacityShadow=0&bgImgOpacityOverlay=0&bgImgOpacityError=95&bgImgOpacityHighlight=55&bgImgOpacityContent=75&bgImgOpacityHeader=75&bgImgOpacityActive=65&bgImgOpacityHover=75&bgImgOpacityDefault=75&bgTextureShadow=flat&bgTextureOverlay=flat&bgTextureError=flat&bgTextureHighlight=flat&bgTextureContent=flat&bgTextureHeader=flat&bgTextureActive=flat&bgTextureHover=flat&bgTextureDefault=flat&cornerRadius=3px&fwDefault=normal&ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&cornerRadiusShadow=8px&thicknessShadow=5px&offsetLeftShadow=0px&offsetTopShadow=0px&opacityShadow=.3&bgColorShadow=%23666666&opacityOverlay=.3&bgColorOverlay=%23aaaaaa&fcError=%235f3f3f&borderColorError=%23f1a899&bgColorError=%23fddfdf&fcHighlight=%23777620&borderColorHighlight=%23dad55e&bgColorHighlight=%23fffa90&fcContent=%23333333&borderColorContent=%23dddddd&bgColorContent=%23ffffff&fcHeader=%23333333&borderColorHeader=%23dddddd&bgColorHeader=%23e9e9e9&fcActive=%23ffffff&borderColorActive=%23003eff&bgColorActive=%23007fff&fcHover=%232b2b2b&borderColorHover=%23cccccc&bgColorHover=%23ededed&fcDefault=%23454545&borderColorDefault=%23c5c5c5&bgColorDefault=%23f6f6f6
@@ -45,7 +45,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	-ms-filter: "alpha(opacity=0)"; /* support: IE8 */
+	filter:Alpha(Opacity=0); /* support: IE8 */
 }
 
 .ui-front {
@@ -664,7 +664,7 @@ button.ui-button::-moz-focus-inner {
 .ui-progressbar .ui-progressbar-overlay {
 	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
 	height: 100%;
-	-ms-filter: "alpha(opacity=25)"; /* support: IE8 */
+	filter: alpha(opacity=25); /* support: IE8 */
 	opacity: 0.25;
 }
 .ui-progressbar-indeterminate .ui-progressbar-value {
@@ -728,7 +728,7 @@ button.ui-button::-moz-focus-inner {
 	z-index: 2;
 	width: 1.2em;
 	height: 1.2em;
-	cursor: pointer;
+	cursor: default;
 	-ms-touch-action: none;
 	touch-action: none;
 }
@@ -1041,18 +1041,18 @@ a.ui-button:active,
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary {
 	opacity: .7;
-	-ms-filter: "alpha(opacity=70)"; /* support: IE8 */
+	filter:Alpha(Opacity=70); /* support: IE8 */
 	font-weight: normal;
 }
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled,
 .ui-widget-header .ui-state-disabled {
 	opacity: .35;
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
+	filter:Alpha(Opacity=35); /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -1093,10 +1093,7 @@ a.ui-button:active,
 }
 
 /* positioning */
-/* Three classes needed to override `.ui-button:hover .ui-icon` */
-.ui-icon-blank.ui-icon-blank.ui-icon-blank {
-	background-image: none;
-}
+.ui-icon-blank { background-position: 16px 16px; }
 .ui-icon-caret-1-n { background-position: 0 0; }
 .ui-icon-caret-1-ne { background-position: -16px 0; }
 .ui-icon-caret-1-e { background-position: -32px 0; }
@@ -1307,7 +1304,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	-ms-filter: Alpha(Opacity=.3); /* support: IE8 */
+	filter: Alpha(Opacity=.3); /* support: IE8 */
 }
 .ui-widget-shadow {
 	-webkit-box-shadow: 0px 0px 5px #666666;

inst/www/shared/jqueryui/jquery-ui.structure.css

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.13.2
+ * jQuery UI CSS Framework 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -49,7 +49,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	-ms-filter: "alpha(opacity=0)"; /* support: IE8 */
+	filter:Alpha(Opacity=0); /* support: IE8 */
 }
 
 .ui-front {
@@ -668,7 +668,7 @@ button.ui-button::-moz-focus-inner {
 .ui-progressbar .ui-progressbar-overlay {
 	background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");
 	height: 100%;
-	-ms-filter: "alpha(opacity=25)"; /* support: IE8 */
+	filter: alpha(opacity=25); /* support: IE8 */
 	opacity: 0.25;
 }
 .ui-progressbar-indeterminate .ui-progressbar-value {
@@ -732,7 +732,7 @@ button.ui-button::-moz-focus-inner {
 	z-index: 2;
 	width: 1.2em;
 	height: 1.2em;
-	cursor: pointer;
+	cursor: default;
 	-ms-touch-action: none;
 	touch-action: none;
 }

inst/www/shared/jqueryui/jquery-ui.theme.css

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.13.2
+ * jQuery UI CSS Framework 1.12.1
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -172,18 +172,18 @@ a.ui-button:active,
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary {
 	opacity: .7;
-	-ms-filter: "alpha(opacity=70)"; /* support: IE8 */
+	filter:Alpha(Opacity=70); /* support: IE8 */
 	font-weight: normal;
 }
 .ui-state-disabled,
 .ui-widget-content .ui-state-disabled,
 .ui-widget-header .ui-state-disabled {
 	opacity: .35;
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
+	filter:Alpha(Opacity=35); /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
+	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -224,10 +224,7 @@ a.ui-button:active,
 }
 
 /* positioning */
-/* Three classes needed to override `.ui-button:hover .ui-icon` */
-.ui-icon-blank.ui-icon-blank.ui-icon-blank {
-	background-image: none;
-}
+.ui-icon-blank { background-position: 16px 16px; }
 .ui-icon-caret-1-n { background-position: 0 0; }
 .ui-icon-caret-1-ne { background-position: -16px 0; }
 .ui-icon-caret-1-e { background-position: -32px 0; }
@@ -438,7 +435,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	-ms-filter: Alpha(Opacity=.3); /* support: IE8 */
+	filter: Alpha(Opacity=.3); /* support: IE8 */
 }
 .ui-widget-shadow {
 	-webkit-box-shadow: 0px 0px 5px #666666;

inst/www/shared/selectize/accessibility/js/selectize-plugin-a11y.js

@@ -42,7 +42,7 @@ Selectize.define("selectize-plugin-a11y", function (options) {
               // random IDs are assigned when .selectize() is called, but we're
               // doing it here to limit the scope of changes.
               var kids = self.$dropdown_content[0].children;
-              for (var i = 0; i < kids.length; i++) {
+              for (i = 0; i < kids.length; i++) {
                 var attrs = kids[i].attributes;
                 if (!attrs.role) {
                   kids[i].setAttribute("role", "option");

inst/www/shared/selectize/accessibility/js/selectize-plugin-a11y.min.js

@@ -1 +1 @@
-Selectize.define("selectize-plugin-a11y",function(c){var t=this,l=13;typeof t.accessibility=="undefined"&&(t.accessibility={}),t.accessibility.helpers={randomId:function(e){for(var r="",s=e||10,i="abcdefghijklmnopqrstuvwxyz0123456789",n=i.length,a=0;a<s;a++)r+=i[Math.floor(n*Math.random())];return r}},t.accessibility.liveRegion={$region:"",speak:function(e){var r=$("<div></div>");r.text(e),this.$region.html(r)},domListener:function(){var e=new MutationObserver(function(r){r.forEach(function(s){var i=$(s.target);if(i.hasClass("items"))if(i.hasClass("dropdown-active")){t.$control_input.attr("aria-expanded","true");for(var n=t.$dropdown_content[0].children,a=0;a<n.length;a++){var o=n[a].attributes;o.role||n[a].setAttribute("role","option"),o.id||n[a].setAttribute("id",t.accessibility.helpers.randomId())}}else t.$control_input.attr("aria-expanded","false"),t.$control_input.removeAttr("aria-activedescendant");else i.hasClass("active")&&i.attr("data-value")&&(t.$control_input.attr("aria-activedescendant",i.attr("id")),t.accessibility.liveRegion.speak(i.text(),500))})});e.observe(t.$dropdown[0],{attributes:!0,attributeFilter:["class"],subtree:!0,attributeOldValue:!0}),e.observe(t.$control[0],{attributes:!0,attributeFilter:["class"]}),e.observe(t.$control_input[0],{attributes:!0,attributeFilter:["value"]})},setAttributes:function(){this.$region.attr({"aria-live":"assertive",role:"log","aria-relevant":"additions","aria-atomic":"true"})},setStyles:function(){this.$region.css({position:"absolute",width:"1px",height:"1px","margin-top":"-1px",clip:"rect(1px, 1px, 1px, 1px)",overflow:"hidden"})},init:function(){this.$region=$("<div>"),this.setAttributes(),this.setStyles(),$("body").append(this.$region),this.domListener()}},this.setup=function(){var e=t.setup;return function(){e.apply(this,arguments);var r=t.accessibility.helpers.randomId(),s=t.accessibility.helpers.randomId();t.$control.on("keydown",function(i){i.keyCode===l&&(t.settings.openOnFocus?(t.settings.openOnFocus=!1,t.focus(),setTimeout(function(){t.settings.openOnFocus=!0},0)):t.focus())}),t.$control_input.attr({role:"combobox","aria-expanded":"false",haspopup:"listbox","aria-owns":s,"aria-label":t.$wrapper.closest("[data-accessibility-selectize-label]").attr("data-accessibility-selectize-label")}),t.$dropdown_content.attr({role:"listbox",id:s}),t.accessibility.liveRegion.init()}}(),this.destroy=function(){var e=t.destroy;return function(){return t.accessibility.liveRegion.$region.remove(),e.apply(this,arguments)}}()});
+Selectize.define("selectize-plugin-a11y",function(c){var t=this,l=13;typeof t.accessibility=="undefined"&&(t.accessibility={}),t.accessibility.helpers={randomId:function(e){for(var a="",s=e||10,r="abcdefghijklmnopqrstuvwxyz0123456789",n=r.length,o=0;o<s;o++)a+=r[Math.floor(n*Math.random())];return a}},t.accessibility.liveRegion={$region:"",speak:function(e){var a=$("<div></div>");a.text(e),this.$region.html(a)},domListener:function(){var e=new MutationObserver(function(a){a.forEach(function(s){var r=$(s.target);if(r.hasClass("items"))if(r.hasClass("dropdown-active")){t.$control_input.attr("aria-expanded","true");var n=t.$dropdown_content[0].children;for(i=0;i<n.length;i++){var o=n[i].attributes;o.role||n[i].setAttribute("role","option"),o.id||n[i].setAttribute("id",t.accessibility.helpers.randomId())}}else t.$control_input.attr("aria-expanded","false"),t.$control_input.removeAttr("aria-activedescendant");else r.hasClass("active")&&r.attr("data-value")&&(t.$control_input.attr("aria-activedescendant",r.attr("id")),t.accessibility.liveRegion.speak(r.text(),500))})});e.observe(t.$dropdown[0],{attributes:!0,attributeFilter:["class"],subtree:!0,attributeOldValue:!0}),e.observe(t.$control[0],{attributes:!0,attributeFilter:["class"]}),e.observe(t.$control_input[0],{attributes:!0,attributeFilter:["value"]})},setAttributes:function(){this.$region.attr({"aria-live":"assertive",role:"log","aria-relevant":"additions","aria-atomic":"true"})},setStyles:function(){this.$region.css({position:"absolute",width:"1px",height:"1px","margin-top":"-1px",clip:"rect(1px, 1px, 1px, 1px)",overflow:"hidden"})},init:function(){this.$region=$("<div>"),this.setAttributes(),this.setStyles(),$("body").append(this.$region),this.domListener()}},this.setup=function(){var e=t.setup;return function(){e.apply(this,arguments);var a=t.accessibility.helpers.randomId(),s=t.accessibility.helpers.randomId();t.$control.on("keydown",function(r){r.keyCode===l&&(t.settings.openOnFocus?(t.settings.openOnFocus=!1,t.focus(),setTimeout(function(){t.settings.openOnFocus=!0},0)):t.focus())}),t.$control_input.attr({role:"combobox","aria-expanded":"false",haspopup:"listbox","aria-owns":s,"aria-label":t.$wrapper.closest("[data-accessibility-selectize-label]").attr("data-accessibility-selectize-label")}),t.$dropdown_content.attr({role:"listbox",id:s}),t.accessibility.liveRegion.init()}}(),this.destroy=function(){var e=t.destroy;return function(){return t.accessibility.liveRegion.$region.remove(),e.apply(this,arguments)}}()});

inst/www/shared/shiny-showcase.css

@@ -1,2 +1,2 @@
-/*! shiny 1.7.4.9001 | (c) 2012-2023 RStudio, PBC. | License: GPL-3 | file LICENSE */
-#showcase-well{border-radius:0}.shiny-code{background-color:#fff;margin-bottom:0}.shiny-code code{font-family:Menlo,Consolas,Courier New,monospace}.shiny-code-container{margin-top:20px;clear:both}.shiny-code-container h3{display:inline;margin-right:15px}.showcase-header{font-size:16px;font-weight:400}.showcase-code-link{text-align:right;padding:15px}#showcase-app-container{vertical-align:top}#showcase-code-tabs{margin-right:15px}#showcase-code-tabs pre{border:none;line-height:1em}#showcase-code-tabs .nav,#showcase-code-tabs ul{margin-bottom:0}#showcase-code-tabs .tab-content{border-style:solid;border-color:#e5e5e5;border-width:0px 1px 1px 1px;overflow:auto;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#showcase-app-code{width:100%}#showcase-code-position-toggle{float:right}#showcase-sxs-code{padding-top:20px;vertical-align:top}.showcase-code-license{display:block;text-align:right}#showcase-code-content pre{background-color:#fff}
+/*! shiny 1.7.1.9003 | (c) 2012-2022 RStudio, PBC. | License: GPL-3 | file LICENSE */
+#showcase-well{border-radius:0}.shiny-code{background-color:#fff;margin-bottom:0}.shiny-code code{font-family:Menlo,Consolas,"Courier New",monospace}.shiny-code-container{margin-top:20px;clear:both}.shiny-code-container h3{display:inline;margin-right:15px}.showcase-header{font-size:16px;font-weight:normal}.showcase-code-link{text-align:right;padding:15px}#showcase-app-container{vertical-align:top}#showcase-code-tabs{margin-right:15px}#showcase-code-tabs pre{border:none;line-height:1em}#showcase-code-tabs .nav{margin-bottom:0}#showcase-code-tabs ul{margin-bottom:0}#showcase-code-tabs .tab-content{border-style:solid;border-color:#e5e5e5;border-width:0px 1px 1px 1px;overflow:auto;border-bottom-right-radius:4px;border-bottom-left-radius:4px}#showcase-app-code{width:100%}#showcase-code-position-toggle{float:right}#showcase-sxs-code{padding-top:20px;vertical-align:top}.showcase-code-license{display:block;text-align:right}#showcase-code-content pre{background-color:#fff}

inst/www/shared/shiny-testmode.js

@@ -1,3 +1,3 @@
-/*! shiny 1.7.4.9001 | (c) 2012-2023 RStudio, PBC. | License: GPL-3 | file LICENSE */
-"use strict";(function(){var a=eval;window.addEventListener("message",function(i){var e=i.data;e.code&&a(e.code)});})();
-//# sourceMappingURL=shiny-testmode.js.map
+/*! shiny 1.7.1.9003 | (c) 2012-2022 RStudio, PBC. | License: GPL-3 | file LICENSE */
+(function(){var a=eval;window.addEventListener("message",function(i){var e=i.data;e.code&&a(e.code)});})();
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vLi4vLi4vc3JjdHMvc3JjL3V0aWxzL2V2YWwudHMiLCAiLi4vLi4vLi4vc3JjdHMvZXh0cmFzL3NoaW55LXRlc3Rtb2RlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyIvL2VzYnVpbGQuZ2l0aHViLmlvL2NvbnRlbnQtdHlwZXMvI2RpcmVjdC1ldmFsXG4vL3RsL2RyO1xuLy8gKiBEaXJlY3QgdXNhZ2Ugb2YgYGV2YWwoXCJ4XCIpYCBpcyBiYWQgd2l0aCBidW5kbGVkIGNvZGUuXG4vLyAqIEluc3RlYWQsIHVzZSBpbmRpcmVjdCBjYWxscyB0byBgZXZhbGAgc3VjaCBhcyBgaW5kaXJlY3RFdmFsKFwieFwiKWBcbi8vICAgKiBFdmVuIGp1c3QgcmVuYW1pbmcgdGhlIGZ1bmN0aW9uIHdvcmtzIHdlbGwgZW5vdWdoLlxuLy8gPiBUaGlzIGlzIGtub3duIGFzIFwiaW5kaXJlY3QgZXZhbFwiIGJlY2F1c2UgZXZhbCBpcyBub3QgYmVpbmcgY2FsbGVkIGRpcmVjdGx5LCBhbmQgc28gZG9lcyBub3QgdHJpZ2dlciB0aGUgZ3JhbW1hdGljYWwgc3BlY2lhbCBjYXNlIGZvciBkaXJlY3QgZXZhbCBpbiB0aGUgSmF2YVNjcmlwdCBWTS4gWW91IGNhbiBjYWxsIGluZGlyZWN0IGV2YWwgdXNpbmcgYW55IHN5bnRheCBhdCBhbGwgZXhjZXB0IGZvciBhbiBleHByZXNzaW9uIG9mIHRoZSBleGFjdCBmb3JtIGV2YWwoJ3gnKS4gRm9yIGV4YW1wbGUsIHZhciBldmFsMiA9IGV2YWw7IGV2YWwyKCd4JykgYW5kIFtldmFsXVswXSgneCcpIGFuZCB3aW5kb3cuZXZhbCgneCcpIGFyZSBhbGwgaW5kaXJlY3QgZXZhbCBjYWxscy5cbi8vID4gV2hlbiB5b3UgdXNlIGluZGlyZWN0IGV2YWwsIHRoZSBjb2RlIGlzIGV2YWx1YXRlZCBpbiB0aGUgZ2xvYmFsIHNjb3BlIGluc3RlYWQgb2YgaW4gdGhlIGlubGluZSBzY29wZSBvZiB0aGUgY2FsbGVyLlxudmFyIGluZGlyZWN0RXZhbCA9IGV2YWw7XG5leHBvcnQgeyBpbmRpcmVjdEV2YWwgfTsiLCAiLyogZXNsaW50LWRpc2FibGUgdW5pY29ybi9maWxlbmFtZS1jYXNlICovXG5pbXBvcnQgeyBpbmRpcmVjdEV2YWwgfSBmcm9tIFwiLi4vc3JjL3V0aWxzL2V2YWxcIjsgLy8gTGlzdGVuIGZvciBtZXNzYWdlcyBmcm9tIHBhcmVudCBmcmFtZS4gVGhpcyBmaWxlIGlzIG9ubHkgYWRkZWQgd2hlbiB0aGVcbi8vIHNoaW55LnRlc3Rtb2RlIG9wdGlvbiBpcyBUUlVFLlxuXG53aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcihcIm1lc3NhZ2VcIiwgZnVuY3Rpb24gKGUpIHtcbiAgdmFyIG1lc3NhZ2UgPSBlLmRhdGE7XG4gIGlmIChtZXNzYWdlLmNvZGUpIGluZGlyZWN0RXZhbChtZXNzYWdlLmNvZGUpO1xufSk7Il0sCiAgIm1hcHBpbmdzIjogIjtZQU9BLEdBQUksR0FBZSxLQ0huQixPQUFPLGlCQUFpQixVQUFXLFNBQVUsRUFBRyxDQUM5QyxHQUFJLEdBQVUsRUFBRSxLQUNoQixBQUFJLEVBQVEsTUFBTSxFQUFhLEVBQVEiLAogICJuYW1lcyI6IFtdCn0K

inst/www/shared/shiny-testmode.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../srcts/src/utils/eval.ts", "../../../srcts/extras/shiny-testmode.ts"],
-  "sourcesContent": ["//esbuild.github.io/content-types/#direct-eval\n//tl/dr;\n// * Direct usage of `eval(\"x\")` is bad with bundled code.\n// * Instead, use indirect calls to `eval` such as `indirectEval(\"x\")`\n//   * Even just renaming the function works well enough.\n// > This is known as \"indirect eval\" because eval is not being called directly, and so does not trigger the grammatical special case for direct eval in the JavaScript VM. You can call indirect eval using any syntax at all except for an expression of the exact form eval('x'). For example, var eval2 = eval; eval2('x') and [eval][0]('x') and window.eval('x') are all indirect eval calls.\n// > When you use indirect eval, the code is evaluated in the global scope instead of in the inline scope of the caller.\nvar indirectEval = eval;\nexport { indirectEval };", "/* eslint-disable unicorn/filename-case */\nimport { indirectEval } from \"../src/utils/eval\"; // Listen for messages from parent frame. This file is only added when the\n// shiny.testmode option is TRUE.\n\nwindow.addEventListener(\"message\", function (e) {\n  var message = e.data;\n  if (message.code) indirectEval(message.code);\n});"],
-  "mappings": ";yBAOA,IAAIA,EAAe,KCHnB,OAAO,iBAAiB,UAAW,SAAUC,EAAG,CAC9C,IAAIC,EAAUD,EAAE,KACZC,EAAQ,MAAMC,EAAaD,EAAQ,IAAI,CAC7C,CAAC",
-  "names": ["indirectEval", "e", "message", "indirectEval"]
-}

man/MockShinySession.Rd

@@ -85,40 +85,40 @@ user. Always \code{NULL} for a \code{MockShinySesion}.}
 \section{Methods}{
 \subsection{Public methods}{
 \itemize{
-\item \href{#method-MockShinySession-new}{\code{MockShinySession$new()}}
-\item \href{#method-MockShinySession-onFlush}{\code{MockShinySession$onFlush()}}
-\item \href{#method-MockShinySession-onFlushed}{\code{MockShinySession$onFlushed()}}
-\item \href{#method-MockShinySession-onEnded}{\code{MockShinySession$onEnded()}}
-\item \href{#method-MockShinySession-isEnded}{\code{MockShinySession$isEnded()}}
-\item \href{#method-MockShinySession-isClosed}{\code{MockShinySession$isClosed()}}
-\item \href{#method-MockShinySession-close}{\code{MockShinySession$close()}}
-\item \href{#method-MockShinySession-cycleStartAction}{\code{MockShinySession$cycleStartAction()}}
-\item \href{#method-MockShinySession-fileUrl}{\code{MockShinySession$fileUrl()}}
-\item \href{#method-MockShinySession-setInputs}{\code{MockShinySession$setInputs()}}
-\item \href{#method-MockShinySession-.scheduleTask}{\code{MockShinySession$.scheduleTask()}}
-\item \href{#method-MockShinySession-elapse}{\code{MockShinySession$elapse()}}
-\item \href{#method-MockShinySession-.now}{\code{MockShinySession$.now()}}
-\item \href{#method-MockShinySession-defineOutput}{\code{MockShinySession$defineOutput()}}
-\item \href{#method-MockShinySession-getOutput}{\code{MockShinySession$getOutput()}}
-\item \href{#method-MockShinySession-ns}{\code{MockShinySession$ns()}}
-\item \href{#method-MockShinySession-flushReact}{\code{MockShinySession$flushReact()}}
-\item \href{#method-MockShinySession-makeScope}{\code{MockShinySession$makeScope()}}
-\item \href{#method-MockShinySession-setEnv}{\code{MockShinySession$setEnv()}}
-\item \href{#method-MockShinySession-setReturned}{\code{MockShinySession$setReturned()}}
-\item \href{#method-MockShinySession-getReturned}{\code{MockShinySession$getReturned()}}
-\item \href{#method-MockShinySession-genId}{\code{MockShinySession$genId()}}
-\item \href{#method-MockShinySession-rootScope}{\code{MockShinySession$rootScope()}}
-\item \href{#method-MockShinySession-unhandledError}{\code{MockShinySession$unhandledError()}}
-\item \href{#method-MockShinySession-freezeValue}{\code{MockShinySession$freezeValue()}}
-\item \href{#method-MockShinySession-onSessionEnded}{\code{MockShinySession$onSessionEnded()}}
-\item \href{#method-MockShinySession-registerDownload}{\code{MockShinySession$registerDownload()}}
-\item \href{#method-MockShinySession-getCurrentOutputInfo}{\code{MockShinySession$getCurrentOutputInfo()}}
-\item \href{#method-MockShinySession-clone}{\code{MockShinySession$clone()}}
+\item \href{#method-new}{\code{MockShinySession$new()}}
+\item \href{#method-onFlush}{\code{MockShinySession$onFlush()}}
+\item \href{#method-onFlushed}{\code{MockShinySession$onFlushed()}}
+\item \href{#method-onEnded}{\code{MockShinySession$onEnded()}}
+\item \href{#method-isEnded}{\code{MockShinySession$isEnded()}}
+\item \href{#method-isClosed}{\code{MockShinySession$isClosed()}}
+\item \href{#method-close}{\code{MockShinySession$close()}}
+\item \href{#method-cycleStartAction}{\code{MockShinySession$cycleStartAction()}}
+\item \href{#method-fileUrl}{\code{MockShinySession$fileUrl()}}
+\item \href{#method-setInputs}{\code{MockShinySession$setInputs()}}
+\item \href{#method-.scheduleTask}{\code{MockShinySession$.scheduleTask()}}
+\item \href{#method-elapse}{\code{MockShinySession$elapse()}}
+\item \href{#method-.now}{\code{MockShinySession$.now()}}
+\item \href{#method-defineOutput}{\code{MockShinySession$defineOutput()}}
+\item \href{#method-getOutput}{\code{MockShinySession$getOutput()}}
+\item \href{#method-ns}{\code{MockShinySession$ns()}}
+\item \href{#method-flushReact}{\code{MockShinySession$flushReact()}}
+\item \href{#method-makeScope}{\code{MockShinySession$makeScope()}}
+\item \href{#method-setEnv}{\code{MockShinySession$setEnv()}}
+\item \href{#method-setReturned}{\code{MockShinySession$setReturned()}}
+\item \href{#method-getReturned}{\code{MockShinySession$getReturned()}}
+\item \href{#method-genId}{\code{MockShinySession$genId()}}
+\item \href{#method-rootScope}{\code{MockShinySession$rootScope()}}
+\item \href{#method-unhandledError}{\code{MockShinySession$unhandledError()}}
+\item \href{#method-freezeValue}{\code{MockShinySession$freezeValue()}}
+\item \href{#method-onSessionEnded}{\code{MockShinySession$onSessionEnded()}}
+\item \href{#method-registerDownload}{\code{MockShinySession$registerDownload()}}
+\item \href{#method-getCurrentOutputInfo}{\code{MockShinySession$getCurrentOutputInfo()}}
+\item \href{#method-clone}{\code{MockShinySession$clone()}}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-new"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-new}{}}}
+\if{html}{\out{<a id="method-new"></a>}}
+\if{latex}{\out{\hypertarget{method-new}{}}}
 \subsection{Method \code{new()}}{
 Create a new MockShinySession.
 \subsection{Usage}{
@@ -127,8 +127,8 @@ Create a new MockShinySession.
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-onFlush"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-onFlush}{}}}
+\if{html}{\out{<a id="method-onFlush"></a>}}
+\if{latex}{\out{\hypertarget{method-onFlush}{}}}
 \subsection{Method \code{onFlush()}}{
 Define a callback to be invoked before a reactive flush
 \subsection{Usage}{
@@ -146,8 +146,8 @@ Define a callback to be invoked before a reactive flush
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-onFlushed"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-onFlushed}{}}}
+\if{html}{\out{<a id="method-onFlushed"></a>}}
+\if{latex}{\out{\hypertarget{method-onFlushed}{}}}
 \subsection{Method \code{onFlushed()}}{
 Define a callback to be invoked after a reactive flush
 \subsection{Usage}{
@@ -165,8 +165,8 @@ Define a callback to be invoked after a reactive flush
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-onEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-onEnded}{}}}
+\if{html}{\out{<a id="method-onEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-onEnded}{}}}
 \subsection{Method \code{onEnded()}}{
 Define a callback to be invoked when the session ends
 \subsection{Usage}{
@@ -182,8 +182,8 @@ Define a callback to be invoked when the session ends
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-isEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-isEnded}{}}}
+\if{html}{\out{<a id="method-isEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-isEnded}{}}}
 \subsection{Method \code{isEnded()}}{
 Returns \code{FALSE} if the session has not yet been closed
 \subsection{Usage}{
@@ -192,8 +192,8 @@ Returns \code{FALSE} if the session has not yet been closed
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-isClosed"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-isClosed}{}}}
+\if{html}{\out{<a id="method-isClosed"></a>}}
+\if{latex}{\out{\hypertarget{method-isClosed}{}}}
 \subsection{Method \code{isClosed()}}{
 Returns \code{FALSE} if the session has not yet been closed
 \subsection{Usage}{
@@ -202,8 +202,8 @@ Returns \code{FALSE} if the session has not yet been closed
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-close"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-close}{}}}
+\if{html}{\out{<a id="method-close"></a>}}
+\if{latex}{\out{\hypertarget{method-close}{}}}
 \subsection{Method \code{close()}}{
 Closes the session
 \subsection{Usage}{
@@ -212,8 +212,8 @@ Closes the session
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-cycleStartAction"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-cycleStartAction}{}}}
+\if{html}{\out{<a id="method-cycleStartAction"></a>}}
+\if{latex}{\out{\hypertarget{method-cycleStartAction}{}}}
 \subsection{Method \code{cycleStartAction()}}{
 Unsophisticated mock implementation that merely invokes
 \subsection{Usage}{
@@ -229,8 +229,8 @@ Unsophisticated mock implementation that merely invokes
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-fileUrl"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-fileUrl}{}}}
+\if{html}{\out{<a id="method-fileUrl"></a>}}
+\if{latex}{\out{\hypertarget{method-fileUrl}{}}}
 \subsection{Method \code{fileUrl()}}{
 Base64-encode the given file. Needed for image rendering.
 \subsection{Usage}{
@@ -250,8 +250,8 @@ Base64-encode the given file. Needed for image rendering.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-setInputs"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-setInputs}{}}}
+\if{html}{\out{<a id="method-setInputs"></a>}}
+\if{latex}{\out{\hypertarget{method-setInputs}{}}}
 \subsection{Method \code{setInputs()}}{
 Sets reactive values associated with the \code{session$inputs}
 object and flushes the reactives.
@@ -280,8 +280,8 @@ session$setInputs(x=1, y=2)
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-.scheduleTask"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-.scheduleTask}{}}}
+\if{html}{\out{<a id="method-.scheduleTask"></a>}}
+\if{latex}{\out{\hypertarget{method-.scheduleTask}{}}}
 \subsection{Method \code{.scheduleTask()}}{
 An internal method which shouldn't be used by others.
 Schedules \code{callback} for execution after some number of \code{millis}
@@ -301,8 +301,8 @@ milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-elapse"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-elapse}{}}}
+\if{html}{\out{<a id="method-elapse"></a>}}
+\if{latex}{\out{\hypertarget{method-elapse}{}}}
 \subsection{Method \code{elapse()}}{
 Simulate the passing of time by the given number of milliseconds.
 \subsection{Usage}{
@@ -318,8 +318,8 @@ Simulate the passing of time by the given number of milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-.now"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-.now}{}}}
+\if{html}{\out{<a id="method-.now"></a>}}
+\if{latex}{\out{\hypertarget{method-.now}{}}}
 \subsection{Method \code{.now()}}{
 An internal method which shouldn't be used by others.
 \subsection{Usage}{
@@ -331,8 +331,8 @@ Elapsed time in milliseconds.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-defineOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-defineOutput}{}}}
+\if{html}{\out{<a id="method-defineOutput"></a>}}
+\if{latex}{\out{\hypertarget{method-defineOutput}{}}}
 \subsection{Method \code{defineOutput()}}{
 An internal method which shouldn't be used by others.
 Defines an output in a way that sets private$currentOutputName
@@ -354,8 +354,8 @@ appropriately.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-getOutput"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-getOutput}{}}}
+\if{html}{\out{<a id="method-getOutput"></a>}}
+\if{latex}{\out{\hypertarget{method-getOutput}{}}}
 \subsection{Method \code{getOutput()}}{
 An internal method which shouldn't be used by others. Forces
 evaluation of any reactive dependencies of the output function.
@@ -376,8 +376,8 @@ output.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-ns"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-ns}{}}}
+\if{html}{\out{<a id="method-ns"></a>}}
+\if{latex}{\out{\hypertarget{method-ns}{}}}
 \subsection{Method \code{ns()}}{
 Returns the given id prefixed by this namespace's id.
 \subsection{Usage}{
@@ -396,8 +396,8 @@ The id with a namespace prefix.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-flushReact"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-flushReact}{}}}
+\if{html}{\out{<a id="method-flushReact"></a>}}
+\if{latex}{\out{\hypertarget{method-flushReact}{}}}
 \subsection{Method \code{flushReact()}}{
 Trigger a reactive flush right now.
 \subsection{Usage}{
@@ -406,8 +406,8 @@ Trigger a reactive flush right now.
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-makeScope"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-makeScope}{}}}
+\if{html}{\out{<a id="method-makeScope"></a>}}
+\if{latex}{\out{\hypertarget{method-makeScope}{}}}
 \subsection{Method \code{makeScope()}}{
 Create and return a namespace-specific session proxy.
 \subsection{Usage}{
@@ -426,8 +426,8 @@ A new session proxy.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-setEnv"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-setEnv}{}}}
+\if{html}{\out{<a id="method-setEnv"></a>}}
+\if{latex}{\out{\hypertarget{method-setEnv}{}}}
 \subsection{Method \code{setEnv()}}{
 Set the environment associated with a testServer() call, but
 only if it has not previously been set. This ensures that only the
@@ -449,8 +449,8 @@ The provided \code{env}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-setReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-setReturned}{}}}
+\if{html}{\out{<a id="method-setReturned"></a>}}
+\if{latex}{\out{\hypertarget{method-setReturned}{}}}
 \subsection{Method \code{setReturned()}}{
 Set the value returned by the module call and proactively
 flush. Note that this method may be called multiple times if modules
@@ -472,8 +472,8 @@ The provided \code{value}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-getReturned"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-getReturned}{}}}
+\if{html}{\out{<a id="method-getReturned"></a>}}
+\if{latex}{\out{\hypertarget{method-getReturned}{}}}
 \subsection{Method \code{getReturned()}}{
 Get the value returned by the module call.
 \subsection{Usage}{
@@ -485,8 +485,8 @@ The value returned by the module call
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-genId"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-genId}{}}}
+\if{html}{\out{<a id="method-genId"></a>}}
+\if{latex}{\out{\hypertarget{method-genId}{}}}
 \subsection{Method \code{genId()}}{
 Generate a distinct character identifier for use as a proxy
 namespace.
@@ -499,8 +499,8 @@ A character identifier unique to the current session.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-rootScope"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-rootScope}{}}}
+\if{html}{\out{<a id="method-rootScope"></a>}}
+\if{latex}{\out{\hypertarget{method-rootScope}{}}}
 \subsection{Method \code{rootScope()}}{
 Provides a way to access the root \code{MockShinySession} from
 any descendant proxy.
@@ -513,8 +513,8 @@ The root \code{MockShinySession}.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-unhandledError"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-unhandledError}{}}}
+\if{html}{\out{<a id="method-unhandledError"></a>}}
+\if{latex}{\out{\hypertarget{method-unhandledError}{}}}
 \subsection{Method \code{unhandledError()}}{
 Called by observers when a reactive expression errors.
 \subsection{Usage}{
@@ -530,8 +530,8 @@ Called by observers when a reactive expression errors.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-freezeValue"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-freezeValue}{}}}
+\if{html}{\out{<a id="method-freezeValue"></a>}}
+\if{latex}{\out{\hypertarget{method-freezeValue}{}}}
 \subsection{Method \code{freezeValue()}}{
 Freeze a value until the flush cycle completes.
 \subsection{Usage}{
@@ -549,8 +549,8 @@ Freeze a value until the flush cycle completes.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-onSessionEnded"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-onSessionEnded}{}}}
+\if{html}{\out{<a id="method-onSessionEnded"></a>}}
+\if{latex}{\out{\hypertarget{method-onSessionEnded}{}}}
 \subsection{Method \code{onSessionEnded()}}{
 Registers the given callback to be invoked when the session
 is closed (i.e. the connection to the client has been severed). The
@@ -570,8 +570,8 @@ guaranteed.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-registerDownload"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-registerDownload}{}}}
+\if{html}{\out{<a id="method-registerDownload"></a>}}
+\if{latex}{\out{\hypertarget{method-registerDownload}{}}}
 \subsection{Method \code{registerDownload()}}{
 Associated a downloadable file with the session.
 \subsection{Usage}{
@@ -598,8 +598,8 @@ function.)}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-getCurrentOutputInfo"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-getCurrentOutputInfo}{}}}
+\if{html}{\out{<a id="method-getCurrentOutputInfo"></a>}}
+\if{latex}{\out{\hypertarget{method-getCurrentOutputInfo}{}}}
 \subsection{Method \code{getCurrentOutputInfo()}}{
 Get information about the output that is currently being
 executed.
@@ -614,8 +614,8 @@ output, or \code{NULL} if no output is currently executing.
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-MockShinySession-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-MockShinySession-clone}{}}}
+\if{html}{\out{<a id="method-clone"></a>}}
+\if{latex}{\out{\hypertarget{method-clone}{}}}
 \subsection{Method \code{clone()}}{
 The objects of this class are cloneable with this method.
 \subsection{Usage}{

man/Progress.Rd

@@ -62,19 +62,19 @@ shinyApp(ui, server)
 \section{Methods}{
 \subsection{Public methods}{
 \itemize{
-\item \href{#method-Progress-new}{\code{Progress$new()}}
-\item \href{#method-Progress-set}{\code{Progress$set()}}
-\item \href{#method-Progress-inc}{\code{Progress$inc()}}
-\item \href{#method-Progress-getMin}{\code{Progress$getMin()}}
-\item \href{#method-Progress-getMax}{\code{Progress$getMax()}}
-\item \href{#method-Progress-getValue}{\code{Progress$getValue()}}
-\item \href{#method-Progress-close}{\code{Progress$close()}}
-\item \href{#method-Progress-clone}{\code{Progress$clone()}}
+\item \href{#method-new}{\code{Progress$new()}}
+\item \href{#method-set}{\code{Progress$set()}}
+\item \href{#method-inc}{\code{Progress$inc()}}
+\item \href{#method-getMin}{\code{Progress$getMin()}}
+\item \href{#method-getMax}{\code{Progress$getMax()}}
+\item \href{#method-getValue}{\code{Progress$getValue()}}
+\item \href{#method-close}{\code{Progress$close()}}
+\item \href{#method-clone}{\code{Progress$clone()}}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-new"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-new}{}}}
+\if{html}{\out{<a id="method-new"></a>}}
+\if{latex}{\out{\hypertarget{method-new}{}}}
 \subsection{Method \code{new()}}{
 Creates a new progress panel (but does not display it).
 \subsection{Usage}{
@@ -107,8 +107,8 @@ is for backward-compatibility).}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-set"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-set}{}}}
+\if{html}{\out{<a id="method-set"></a>}}
+\if{latex}{\out{\hypertarget{method-set}{}}}
 \subsection{Method \code{set()}}{
 Updates the progress panel. When called the first time, the
 progress panel is displayed.
@@ -135,8 +135,8 @@ relative to \code{message}.}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-inc"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-inc}{}}}
+\if{html}{\out{<a id="method-inc"></a>}}
+\if{latex}{\out{\hypertarget{method-inc}{}}}
 \subsection{Method \code{inc()}}{
 Like \code{set}, this updates the progress panel. The difference
 is that \code{inc} increases the progress bar by \code{amount}, instead of
@@ -163,8 +163,8 @@ relative to \code{message}.}
 }
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-getMin"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-getMin}{}}}
+\if{html}{\out{<a id="method-getMin"></a>}}
+\if{latex}{\out{\hypertarget{method-getMin}{}}}
 \subsection{Method \code{getMin()}}{
 Returns the minimum value.
 \subsection{Usage}{
@@ -173,8 +173,8 @@ Returns the minimum value.
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-getMax"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-getMax}{}}}
+\if{html}{\out{<a id="method-getMax"></a>}}
+\if{latex}{\out{\hypertarget{method-getMax}{}}}
 \subsection{Method \code{getMax()}}{
 Returns the maximum value.
 \subsection{Usage}{
@@ -183,8 +183,8 @@ Returns the maximum value.
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-getValue"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-getValue}{}}}
+\if{html}{\out{<a id="method-getValue"></a>}}
+\if{latex}{\out{\hypertarget{method-getValue}{}}}
 \subsection{Method \code{getValue()}}{
 Returns the current value.
 \subsection{Usage}{
@@ -193,8 +193,8 @@ Returns the current value.
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-close"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-close}{}}}
+\if{html}{\out{<a id="method-close"></a>}}
+\if{latex}{\out{\hypertarget{method-close}{}}}
 \subsection{Method \code{close()}}{
 Removes the progress panel. Future calls to \code{set} and
 \code{close} will be ignored.
@@ -204,8 +204,8 @@ Removes the progress panel. Future calls to \code{set} and
 
 }
 \if{html}{\out{<hr>}}
-\if{html}{\out{<a id="method-Progress-clone"></a>}}
-\if{latex}{\out{\hypertarget{method-Progress-clone}{}}}
+\if{html}{\out{<a id="method-clone"></a>}}
+\if{latex}{\out{\hypertarget{method-clone}{}}}
 \subsection{Method \code{clone()}}{
 The objects of this class are cloneable with this method.
 \subsection{Usage}{

man/bindCache.Rd

@@ -40,9 +40,7 @@ sense, namely:
 
 In the example here, the \code{bindCache()} key consists of \code{input$x} and
 \code{input$y} combined, and the value is \code{input$x * input$y}. In this simple
-example, for any given key, there is only one possible returned value.
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
+example, for any given key, there is only one possible returned value.\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
   bindCache(input$x, input$y)
 }\if{html}{\out{</div>}}
 
@@ -65,9 +63,7 @@ to do some sort of reduction on the data that still captures information
 about whether a value can be retrieved from the cache. For example, if you
 have a large data set with timestamps, it might make sense to extract the
 most recent timestamp and return that. Then, instead of hashing the entire
-data object, the cached reactive only needs to hash the timestamp.
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{r <- reactive(\{ compute(bigdata()) \} \%>\%
+data object, the cached reactive only needs to hash the timestamp.\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ compute(bigdata()) \} \%>\%
   bindCache(\{ extract_most_recent_time(bigdata()) \})
 }\if{html}{\out{</div>}}
 
@@ -109,9 +105,7 @@ cache key is not too expensive.
 Remember that the key is \emph{reactive}, so it is not re-executed every single
 time that someone accesses the cached reactive. It is only re-executed if
 it has been invalidated by one of the reactives it depends on. For
-example, suppose we have this cached reactive:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
+example, suppose we have this cached reactive:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{ input$x * input$y \}) \%>\%
  bindCache(input$x, input$y)
 }\if{html}{\out{</div>}}
 
@@ -160,30 +154,24 @@ persists beyond the current R session.
 To use different settings for an application-scoped cache, you can call
 \code{\link[=shinyOptions]{shinyOptions()}} at the top of your app.R, server.R, or
 global.R. For example, this will create a cache with 500 MB of space
-instead of the default 200 MB:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_mem(max_size = 500e6))
-}\if{html}{\out{</div>}}
+instead of the default 200 MB:\preformatted{shinyOptions(cache = cachem::cache_mem(max_size = 500e6))
+}
 
 To use different settings for a session-scoped cache, you can set
 \code{self$cache} at the top of your server function. By default, it will create
 a 200 MB memory cache for each session, but you can replace it with
 something different. To use the session-scoped cache, you must also call
 \code{bindCache()} with \code{cache="session"}. This will create a 100 MB cache for
-the session:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{function(input, output, session) \{
+the session:\preformatted{function(input, output, session) \{
   session$cache <- cachem::cache_mem(max_size = 100e6)
   ...
 \}
-}\if{html}{\out{</div>}}
+}
 
 If you want to use a cache that is shared across multiple R processes, you
 can use a \code{\link[cachem:cache_disk]{cachem::cache_disk()}}. You can create a application-level shared
-cache by putting this at the top of your app.R, server.R, or global.R:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache"))
-}\if{html}{\out{</div>}}
+cache by putting this at the top of your app.R, server.R, or global.R:\preformatted{shinyOptions(cache = cachem::cache_disk(file.path(dirname(tempdir()), "myapp-cache"))
+}
 
 This will create a subdirectory in your system temp directory named
 \code{myapp-cache} (replace \code{myapp-cache} with a unique name of
@@ -193,10 +181,8 @@ stops of the R process, as long as you do not reboot.
 
 To have the cache persist even across multiple reboots, you can create the
 cache in a location outside of the temp directory. For example, it could
-be a subdirectory of the application:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{shinyOptions(cache = cachem::cache_disk("./myapp-cache"))
-}\if{html}{\out{</div>}}
+be a subdirectory of the application:\preformatted{shinyOptions(cache = cachem::cache_disk("./myapp-cache"))
+}
 
 In this case, resetting the cache will have to be done manually, by deleting
 the directory.
@@ -261,11 +247,9 @@ You may need to provide a \code{cacheHint} to \code{\link[=createRenderFunction]
 \code{htmlwidgets::shinyRenderWidget()}, if you've authored an htmlwidget) in
 order for \code{bindCache()} to correctly compute a cache key.
 
-The potential problem is a cache collision. Consider the following:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{output$x1 <- renderText(\{ input$x \}) \%>\% bindCache(input$x)
+The potential problem is a cache collision. Consider the following:\preformatted{output$x1 <- renderText(\{ input$x \}) \%>\% bindCache(input$x)
 output$x2 <- renderText(\{ input$x * 2 \}) \%>\% bindCache(input$x)
-}\if{html}{\out{</div>}}
+}
 
 Both \code{output$x1} and \code{output$x2} use \code{input$x} as part of their cache key,
 but if it were the only thing used in the cache key, then the two outputs
@@ -274,9 +258,7 @@ this, a \emph{cache hint} is automatically added when \code{\link[=renderText]{r
 \code{\link[=createRenderFunction]{createRenderFunction()}}. The cache hint is used as part of the actual
 cache key, in addition to the one passed to \code{bindCache()} by the user. The
 cache hint can be viewed by calling the internal Shiny function
-\code{extractCacheHint()}:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{r <- renderText(\{ input$x \})
+\code{extractCacheHint()}:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- renderText(\{ input$x \})
 shiny:::extractCacheHint(r)
 }\if{html}{\out{</div>}}
 
@@ -307,9 +289,7 @@ that may influence the final value.
 For \pkg{htmlwidgets}, it will try to automatically infer a cache hint;
 again, you can inspect the cache hint with \code{shiny:::extractCacheHint()} and
 also test it in an application. If you do need to explicitly provide a
-cache hint, pass it to \code{shinyRenderWidget}. For example:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{renderMyWidget <- function(expr) \{
+cache hint, pass it to \code{shinyRenderWidget}. For example:\preformatted{renderMyWidget <- function(expr) \{
   q <- rlang::enquo0(expr)
 
   htmlwidgets::shinyRenderWidget(
@@ -319,7 +299,7 @@ cache hint, pass it to \code{shinyRenderWidget}. For example:
     cacheHint = list(label = "myWidget", userQuo = q)
   )
 \}
-}\if{html}{\out{</div>}}
+}
 
 If your \code{render} function sets any internal state, you may find it useful
 in your call to \code{\link[=createRenderFunction]{createRenderFunction()}} to use
@@ -350,10 +330,8 @@ For developers of such code, they should call \code{\link[=createRenderFunction]
 
 When \code{bindCache()} is used with \code{renderPlot()}, the \code{height} and \code{width}
 passed to the original \code{renderPlot()} are ignored. They are superseded by
-\code{sizePolicy} argument passed to `bindCache. The default is:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2)
-}\if{html}{\out{</div>}}
+\code{sizePolicy} argument passed to `bindCache. The default is:\preformatted{sizePolicy = sizeGrowthRatio(width = 400, height = 400, growthRate = 1.2)
+}
 
 \code{sizePolicy} must be a function that takes a two-element numeric vector as
 input, representing the width and height of the \verb{<img>} element in the

man/bindEvent.Rd

@@ -171,9 +171,7 @@ user sets both \code{x} and \code{y}, and then clicks on an \link{actionButton}
 \code{go}.
 
 To use both caching and events, the object should first be passed to
-\code{bindCache()}, then \code{bindEvent()}. For example:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{r <- reactive(\{
+\code{bindCache()}, then \code{bindEvent()}. For example:\if{html}{\out{<div class="sourceCode NA">}}\preformatted{r <- reactive(\{
    Sys.sleep(2)  # Pretend this is an expensive computation
    input$x * input$y
  \}) \%>\%

man/bootstrapPage.Rd

@@ -28,7 +28,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI definition that can be passed to the \link{shinyUI} function.
+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

man/createRenderFunction.Rd

@@ -125,12 +125,12 @@ function.
 }
 \section{Functions}{
 \itemize{
-\item \code{quoToFunction()}: convert a quosure to a function.
+\item \code{quoToFunction}: convert a quosure to a function.
 
-\item \code{installExprFunction()}: converts a user's reactive \code{expr} into a
+\item \code{installExprFunction}: converts a user's reactive \code{expr} into a
 function that's assigned to a \code{name} in the \code{assign.env}.
-
 }}
+
 \examples{
 # A custom render function that repeats the supplied value 3 times
 renderTriple <- function(expr) {

man/devmode.Rd

@@ -71,7 +71,7 @@ registered \code{devmode_default} value will be used.}
 \code{TRUE} and the specified option is not set in \code{\link[=options]{options()}}.}
 }
 \description{
-\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#experimental}{\figure{lifecycle-experimental.svg}{options: alt='[Experimental]'}}}{\strong{[Experimental]}}
+\lifecycle{experimental}
 
 Developer Mode enables a number of \code{\link[=options]{options()}} to make a developer's life
 easier, like enabling non-minified JS and printing messages about
@@ -84,26 +84,24 @@ Please see the function descriptions for more details.
 }
 \section{Functions}{
 \itemize{
-\item \code{devmode()}: Function to set two options to enable/disable Shiny
+\item \code{devmode}: Function to set two options to enable/disable Shiny
 Developer Mode and Developer messages
 
-\item \code{in_devmode()}: Determines if Shiny is in Developer Mode. If the
+\item \code{in_devmode}: Determines if Shiny is in Developer Mode. If the
 \code{getOption("shiny.devmode")} is set to \code{TRUE} and not in testing inside
 \code{testthat}, then Shiny Developer Mode is enabled.
 
-\item \code{with_devmode()}: Temporarily set Shiny Developer Mode and Developer
+\item \code{with_devmode}: Temporarily set Shiny Developer Mode and Developer
 message verbosity
 
-\item \code{devmode_inform()}: If Shiny Developer Mode and verbosity are enabled,
+\item \code{devmode_inform}: If Shiny Developer Mode and verbosity are enabled,
 displays a message once every 8 hrs (by default)
 
-\item \code{register_devmode_option()}: Registers a Shiny Developer Mode option with an updated
+\item \code{register_devmode_option}: Registers a Shiny Developer Mode option with an updated
 value and Developer message. This registration method allows package
 authors to write one message in a single location.
 
-For example, the following Shiny Developer Mode options are registered:
-
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Reload the Shiny app when a sourced R file changes
+For example, the following Shiny Developer Mode options are registered:\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Reload the Shiny app when a sourced R file changes
 register_devmode_option(
   "shiny.autoreload",
   "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
@@ -128,9 +126,7 @@ register_devmode_option(
 Other known, non-Shiny Developer Mode options:
 \itemize{
 \item Sass:
-}
-
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Display the full stack trace when errors occur during Shiny app execution
+}\if{html}{\out{<div class="sourceCode r">}}\preformatted{# Display the full stack trace when errors occur during Shiny app execution
 register_devmode_option(
   "sass.cache",
   "Turning off sass cache. To use default caching, call `options(sass.cache = TRUE)`",
@@ -138,7 +134,7 @@ register_devmode_option(
 )
 }\if{html}{\out{</div>}}
 
-\item \code{get_devmode_option()}: Provides a consistent way to change the expected
+\item \code{get_devmode_option}: Provides a consistent way to change the expected
 \code{\link[=getOption]{getOption()}} behavior when Developer Mode is enabled. This method is very
 similar to \code{\link[=getOption]{getOption()}} where the globally set option takes precedence.
 See section "Avoiding direct dependency on shiny" for
@@ -148,8 +144,8 @@ See section "Avoiding direct dependency on shiny" for
 \code{register_devmode_option()} to avoid supplying the same \code{devmode_default}
 and \code{devmode_message} values throughout your package. (This requires a
 \pkg{shiny} dependency.)
-
 }}
+
 \section{Avoiding direct dependency on shiny}{
 
 
@@ -169,9 +165,7 @@ re-implementing these two functions:
 
 This function should return \code{TRUE} if \code{getOption("shiny.devmode")} is set.
 In addition, we strongly recommend that it also checks to make sure
-\code{testthat} is not testing.
-
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{in_devmode <- function() \{
+\code{testthat} is not testing.\if{html}{\out{<div class="sourceCode r">}}\preformatted{in_devmode <- function() \{
   isTRUE(getOption("shiny.devmode", FALSE)) &&
     !identical(Sys.getenv("TESTTHAT"), "true")
 \}
@@ -207,9 +201,7 @@ recommend displaying a message (\code{devmode_message}) to \code{stderr()} once
 hours using \code{\link[rlang:abort]{rlang::inform()}}. This will keep the author up to date as to
 which Dev Mode options are being altered. To allow developers a chance to
 disable Dev Mode messages, the message should be skipped if
-\code{getOption("shiny.devmode.verbose", TRUE)} is not \code{TRUE}.
-
-\if{html}{\out{<div class="sourceCode r">}}\preformatted{get_devmode_option <- function(name, default = NULL, devmode_default, devmode_message) \{
+\code{getOption("shiny.devmode.verbose", TRUE)} is not \code{TRUE}.\if{html}{\out{<div class="sourceCode r">}}\preformatted{get_devmode_option <- function(name, default = NULL, devmode_default, devmode_message) \{
   if (!in_devmode()) \{
     # Dev Mode disabled, act like `getOption()`
     return(getOption(name, default = default))

man/diskCache.Rd

@@ -40,7 +40,7 @@ deleted from disk. If \code{FALSE} (the default), it will do nothing when
 finalized.}
 
 \item{missing}{A value to return when \code{get(key)} is called but the key is not
-present in the cache. The default is a \code{\link[cachem:key_missing]{key_missing()}} object. It is
+present in the cache. The default is a \code{\link[cachem:reexports]{key_missing()}} object. It is
 actually an expression that is evaluated each time there is a cache miss.
 See section Missing keys for more information.}
 

man/downloadHandler.Rd

@@ -4,7 +4,7 @@
 \alias{downloadHandler}
 \title{File Downloads}
 \usage{
-downloadHandler(filename, content, contentType = NULL, outputArgs = list())
+downloadHandler(filename, content, contentType = NA, outputArgs = list())
 }
 \arguments{
 \item{filename}{A string of the filename, including extension, that the
@@ -19,9 +19,9 @@ function.)}
 
 \item{contentType}{A string of the download's
 \href{https://en.wikipedia.org/wiki/Internet_media_type}{content type}, for
-example \code{"text/csv"} or \code{"image/png"}. If \code{NULL}, the content type
-will be guessed based on the filename extension, or
-\code{application/octet-stream} if the extension is unknown.}
+example \code{"text/csv"} or \code{"image/png"}. If \code{NULL} or
+\code{NA}, the content type will be guessed based on the filename
+extension, or \code{application/octet-stream} if the extension is unknown.}
 
 \item{outputArgs}{A list of arguments to be passed through to the implicit
 call to \code{\link[=downloadButton]{downloadButton()}} when \code{downloadHandler} is used

man/fileInput.Rd

@@ -11,8 +11,7 @@ fileInput(
   accept = NULL,
   width = NULL,
   buttonLabel = "Browse...",
-  placeholder = "No file selected",
-  capture = NULL
+  placeholder = "No file selected"
 )
 }
 \arguments{
@@ -43,19 +42,6 @@ see \code{\link[=validateCssUnit]{validateCssUnit()}}.}
 object.}
 
 \item{placeholder}{The text to show before a file has been uploaded.}
-
-\item{capture}{What source to use for capturing image, audio or video data.
-This attribute facilitates user access to a device's media capture
-mechanism, such as a camera, or microphone, from within a file upload
-control.
-
-A value of \code{user} indicates that the user-facing camera and/or microphone
-should be used. A value of \code{environment} specifies that the outward-facing
-camera and/or microphone should be used.
-
-By default on most phones, this will accept still photos or video. For
-still photos only, also use \code{accept="image/*"}. For video only, use
-\code{accept="video/*"}.}
 }
 \description{
 Create a file upload control that can be used to upload one or more files.

man/fixedPage.Rd

@@ -28,7 +28,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI definition that can be passed to the \link{shinyUI} function.
+A UI defintion that can be passed to the \link{shinyUI} function.
 }
 \description{
 Functions for creating fixed page layouts. A fixed page layout consists of

man/fluidPage.Rd

@@ -29,7 +29,7 @@ This will be used as the lang in the \code{<html>} tag, as in \code{<html lang="
 The default (NULL) results in an empty string.}
 }
 \value{
-A UI definition that can be passed to the \link{shinyUI} function.
+A UI defintion that can be passed to the \link{shinyUI} function.
 }
 \description{
 Functions for creating fluid page layouts. A fluid page layout consists of

man/htmlOutput.Rd

@@ -9,17 +9,10 @@ htmlOutput(
   outputId,
   inline = FALSE,
   container = if (inline) span else div,
-  fill = FALSE,
   ...
 )
 
-uiOutput(
-  outputId,
-  inline = FALSE,
-  container = if (inline) span else div,
-  fill = FALSE,
-  ...
-)
+uiOutput(outputId, inline = FALSE, container = if (inline) span else div, ...)
 }
 \arguments{
 \item{outputId}{output variable to read the value from}
@@ -29,13 +22,6 @@ for the output}
 
 \item{container}{a function to generate an HTML element to contain the text}
 
-\item{fill}{If \code{TRUE}, the result of \code{container} is treated as \emph{both} a fill
-item and container (see \code{\link[htmltools:bindFillRole]{htmltools::bindFillRole()}}), which means both the
-\code{container} as well as its immediate children (i.e., the result of
-\code{renderUI()}) are allowed to grow/shrink to fit a fill container with an
-opinionated height. Set \code{fill = "item"} or \code{fill = "container"} to treat
-\code{container} as just a fill item or a fill container.}
-
 \item{...}{Other arguments to pass to the container tag function. This is
 useful for providing additional classes for the tag.}
 }
@@ -44,12 +30,12 @@ An HTML output element that can be included in a panel
 }
 \description{
 Render a reactive output variable as HTML within an application page. The
-text will be included within an HTML \code{div} tag, and is presumed to contain
-HTML content which should not be escaped.
+text will be included within an HTML \code{div} tag, and is presumed to
+contain HTML content which should not be escaped.
 }
 \details{
-\code{uiOutput} is intended to be used with \code{renderUI} on the server side. It is
-currently just an alias for \code{htmlOutput}.
+\code{uiOutput} is intended to be used with \code{renderUI} on the server
+side. It is currently just an alias for \code{htmlOutput}.
 }
 \examples{
 htmlOutput("summary")

man/loadSupport.Rd

@@ -15,7 +15,7 @@ loadSupport(
 not supplied, the nearest enclosing directory that is a Shiny app, starting
 with the current directory, is used.}
 
-\item{renv}{The environment in which the files in the \verb{R/} directory should
+\item{renv}{The environmeny in which the files in the \verb{R/} directory should
 be evaluated.}
 
 \item{globalrenv}{The environment in which \code{global.R} should be evaluated. If

man/memoryCache.Rd

@@ -30,7 +30,7 @@ value of \code{evict}. Use \code{Inf} for no limit of number of items.}
 when a cache pruning occurs. Currently, \code{"lru"} and \code{"fifo"} are supported.}
 
 \item{missing}{A value to return when \code{get(key)} is called but the key is not
-present in the cache. The default is a \code{\link[cachem:key_missing]{key_missing()}} object. It is
+present in the cache. The default is a \code{\link[cachem:reexports]{key_missing()}} object. It is
 actually an expression that is evaluated each time there is a cache miss.
 See section Missing keys for more information.}
 

man/modalDialog.Rd

@@ -24,10 +24,7 @@ modalButton(label, icon = NULL)
 \item{footer}{UI for footer. Use \code{NULL} for no footer.}
 
 \item{size}{One of \code{"s"} for small, \code{"m"} (the default) for medium,
-\code{"l"} for large, or \code{"xl"} for extra large. Note that \code{"xl"} only
-works with Bootstrap 4 and above (to opt-in to Bootstrap 4+,
-pass \code{\link[bslib:bs_theme]{bslib::bs_theme()}} to the \code{theme} argument of a page container
-like \code{\link[=fluidPage]{fluidPage()}}).}
+or \code{"l"} for large.}
 
 \item{easyClose}{If \code{TRUE}, the modal dialog can be dismissed by
 clicking outside the dialog box, or be pressing the Escape key. If

man/navbarPage.Rd

@@ -89,7 +89,7 @@ is needed if you want to insert/remove or show/hide an entire
 \item{icon}{Optional icon to appear on a \code{navbarMenu} tab.}
 }
 \value{
-A UI definition that can be passed to the \link{shinyUI} function.
+A UI defintion that can be passed to the \link{shinyUI} function.
 }
 \description{
 Create a page that contains a top level navigation bar that can be used to

man/pageWithSidebar.Rd

@@ -14,7 +14,7 @@ pageWithSidebar(headerPanel, sidebarPanel, mainPanel)
 \item{mainPanel}{The \link{mainPanel} containing outputs}
 }
 \value{
-A UI definition that can be passed to the \link{shinyUI} function
+A UI defintion that can be passed to the \link{shinyUI} function
 }
 \description{
 \strong{DEPRECATED}: use \code{\link[=fluidPage]{fluidPage()}} and \code{\link[=sidebarLayout]{sidebarLayout()}} instead.

man/plotOutput.Rd

@@ -13,8 +13,7 @@ imageOutput(
   dblclick = NULL,
   hover = NULL,
   brush = NULL,
-  inline = FALSE,
-  fill = FALSE
+  inline = FALSE
 )
 
 plotOutput(
@@ -25,8 +24,7 @@ plotOutput(
   dblclick = NULL,
   hover = NULL,
   brush = NULL,
-  inline = FALSE,
-  fill = !inline
+  inline = FALSE
 )
 }
 \arguments{
@@ -78,12 +76,6 @@ same \code{id} to disappear.}
 
 \item{inline}{use an inline (\code{span()}) or block container (\code{div()})
 for the output}
-
-\item{fill}{Whether or not the returned tag should be treated as a fill item,
-meaning that its \code{height} is allowed to grow/shrink to fit a fill container
-with an opinionated height (see \code{\link[htmltools:bindFillRole]{htmltools::bindFillRole()}}) with an
-opinionated height. Examples of fill containers include \code{bslib::card()} and
-\code{bslib::card_body_fill()}.}
 }
 \value{
 A plot or image output element that can be included in a panel.

man/plotPNG.Rd

@@ -2,7 +2,7 @@
 % Please edit documentation in R/imageutils.R
 \name{plotPNG}
 \alias{plotPNG}
-\title{Capture a plot as a PNG file.}
+\title{Run a plotting function and save the output as a PNG}
 \usage{
 plotPNG(
   func,
@@ -23,30 +23,27 @@ extension \code{.png}.}
 
 \item{height}{Height in pixels.}
 
-\item{res}{Resolution in pixels per inch. This value is passed to the
-graphics device. Note that this affects the resolution of PNG rendering in
+\item{res}{Resolution in pixels per inch. This value is passed to
+\code{\link[grDevices:png]{grDevices::png()}}. Note that this affects the resolution of PNG rendering in
 R; it won't change the actual ppi of the browser.}
 
-\item{...}{Arguments to be passed through to the graphics device. These can
-be used to set the width, height, background color, etc.}
-}
-\value{
-A path to the newly generated PNG file.
+\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
+These can be used to set the width, height, background color, etc.}
 }
 \description{
-The PNG graphics device used is determined in the following order:
-\itemize{
-\item If the ragg package is installed (and the \code{shiny.useragg} is not
-set to \code{FALSE}), then use \code{\link[ragg:agg_png]{ragg::agg_png()}}.
-\item If a quartz device is available (i.e., \code{capabilities("aqua")} is
-\code{TRUE}), then use \code{png(type = "quartz")}.
-\item If the Cairo package is installed (and the \code{shiny.usecairo} option
-is not set to \code{FALSE}), then use \code{\link[Cairo:Cairo]{Cairo::CairoPNG()}}.
-\item Otherwise, use \code{\link[grDevices:png]{grDevices::png()}}. In this case, Linux and Windows
-may not antialias some point shapes, resulting in poor quality output.
-}
+This function returns the name of the PNG file that it generates. In
+essence, it calls \code{png()}, then \code{func()}, then \code{dev.off()}.
+So \code{func} must be a function that will generate a plot when used this
+way.
 }
 \details{
-A \code{NULL} value provided to \code{width} or \code{height} is ignored (i.e., the
-default \code{width} or \code{height} of the graphics device is used).
+For output, it will try to use the following devices, in this order:
+quartz (via \code{\link[grDevices:png]{grDevices::png()}}), then \code{\link[Cairo:Cairo]{Cairo::CairoPNG()}},
+and finally \code{\link[grDevices:png]{grDevices::png()}}. This is in order of quality of
+output. Notably, plain \code{png} output on Linux and Windows may not
+antialias some point shapes, resulting in poor quality output.
+
+In some cases, \code{Cairo()} provides output that looks worse than
+\code{png()}. To disable Cairo output for an app, use
+\code{options(shiny.usecairo=FALSE)}.
 }

man/reactlog.Rd

@@ -51,11 +51,11 @@ of the source code of your reactive expressions and observers.
 }
 \section{Functions}{
 \itemize{
-\item \code{reactlog()}: Return a list of reactive information.  Can be used in conjunction with
+\item \code{reactlog}: Return a list of reactive information.  Can be used in conjunction with
 \link[reactlog:reactlog_show]{reactlog::reactlog_show} to later display the reactlog graph.
 
-\item \code{reactlogShow()}: Display a full reactlog graph for all sessions.
-
-\item \code{reactlogReset()}: Resets the entire reactlog stack.  Useful for debugging and removing all prior reactive history.
+\item \code{reactlogShow}: Display a full reactlog graph for all sessions.
 
+\item \code{reactlogReset}: Resets the entire reactlog stack.  Useful for debugging and removing all prior reactive history.
 }}
+

man/reexports.Rd

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

man/renderCachedPlot.Rd

@@ -37,7 +37,7 @@ information on the default sizing policy.}
 (the default), \code{"session"}, or a cache object like a
 \code{\link[cachem:cache_disk]{cachem::cache_disk()}}. See the Cache Scoping section for more information.}
 
-\item{...}{Arguments to be passed through to \code{\link[=plotPNG]{plotPNG()}}.
+\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
 These can be used to set the width, height, background color, etc.}
 
 \item{alt}{Alternate text for the HTML \verb{<img>} tag if it cannot be displayed

man/renderPlot.Rd

@@ -35,10 +35,10 @@ When rendering an inline plot, you must provide numeric values (in pixels)
 to both \code{width} and \code{height}.}
 
 \item{res}{Resolution of resulting plot, in pixels per inch. This value is
-passed to \code{\link[=plotPNG]{plotPNG()}}. Note that this affects the resolution of PNG
+passed to \code{\link[grDevices:png]{grDevices::png()}}. Note that this affects the resolution of PNG
 rendering in R; it won't change the actual ppi of the browser.}
 
-\item{...}{Arguments to be passed through to \code{\link[=plotPNG]{plotPNG()}}.
+\item{...}{Arguments to be passed through to \code{\link[grDevices:png]{grDevices::png()}}.
 These can be used to set the width, height, background color, etc.}
 
 \item{alt}{Alternate text for the HTML \verb{<img>} tag if it cannot be displayed

man/req.Rd

@@ -25,30 +25,26 @@ nor displayed in the Shiny app's UI).
 \details{
 The \code{req} function was designed to be used in one of two ways. The first
 is to call it like a statement (ignoring its return value) before attempting
-operations using the required values:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{rv <- reactiveValues(state = FALSE)
+operations using the required values:\preformatted{rv <- reactiveValues(state = FALSE)
 r <- reactive(\{
   req(input$a, input$b, rv$state)
   # Code that uses input$a, input$b, and/or rv$state...
 \})
-}\if{html}{\out{</div>}}
+}
 
 In this example, if \code{r()} is called and any of \code{input$a},
 \code{input$b}, and \code{rv$state} are \code{NULL}, \code{FALSE}, \code{""},
 etc., then the \code{req} call will trigger an error that propagates all the
 way up to whatever render block or observer is executing.
 
-The second is to use it to wrap an expression that must be truthy:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{output$plot <- renderPlot(\{
+The second is to use it to wrap an expression that must be truthy:\preformatted{output$plot <- renderPlot(\{
   if (req(input$plotType) == "histogram") \{
     hist(dataset())
   \} else if (input$plotType == "scatter") \{
     qplot(dataset(), aes(x = x, y = y))
   \}
 \})
-}\if{html}{\out{</div>}}
+}
 
 In this example, \code{req(input$plotType)} first checks that
 \code{input$plotType} is truthy, and if so, returns it. This is a convenient

man/session.Rd

@@ -96,10 +96,9 @@ The equivalent of hitting the browser's Reload button. Only works if the
 session is actually connected.
 }
 \item{request}{
-An environment that implements the \href{https://github.com/jeffreyhorner/Rook#the-environment}{Rook specification} for
-HTTP requests. This is the request that was used to initiate the websocket
-connection (as opposed to the request that downloaded the web page for the
-app).
+An environment that implements the Rook specification for HTTP requests.
+This is the request that was used to initiate the websocket connection
+(as opposed to the request that downloaded the web page for the app).
 }
 \item{userData}{
 An environment for app authors and module/package authors to store whatever

man/shinyAppTemplate.Rd

@@ -10,7 +10,7 @@ shinyAppTemplate(path = NULL, examples = "default", dryrun = FALSE)
 \item{path}{Path to create new shiny application template.}
 
 \item{examples}{Either one of "default", "ask", "all", or any combination of
-"app", "rdir", "module", and "tests". In an
+"app", "rdir", "module", "shinytest", and "testthat". In an
 interactive session, "default" falls back to "ask"; in a non-interactive
 session, "default" falls back to "all". With "ask", this function will
 prompt the user to select which template items will be added to the new app
@@ -25,32 +25,30 @@ This function populates a directory with files for a Shiny application.
 }
 \details{
 In an interactive R session, this function will, by default, prompt the user
-to select which components to add to the application. Choices are
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{1: All
+to select which components to add to the application. Choices are\preformatted{1: All
 2: app.R              : Main application file
 3: R/example.R        : Helper file with R code
 4: R/example-module.R : Example module
-5: tests/testthat/    : Tests using the testthat and shinytest2 package
-}\if{html}{\out{</div>}}
+5: tests/shinytest/   : Tests using the shinytest package
+6: tests/testthat/    : Tests using the testthat package
+}
 
 If option 1 is selected, the full example application including the
-following files and directories is created:
-
-\if{html}{\out{<div class="sourceCode">}}\preformatted{appdir/
+following files and directories is created:\preformatted{appdir/
 |- app.R
 |- R
 |   |- example-module.R
 |   `- example.R
 `- tests
+    |- shinytest.R
+    |- shinytest
+    |   `- mytest.R
     |- testthat.R
     `- testthat
-        |- setup-shinytest2.R
         |- test-examplemodule.R
         |- test-server.R
-        |- test-shinytest2.R
         `- test-sort.R
-}\if{html}{\out{</div>}}
+}
 
 Some notes about these files:
 \itemize{
@@ -64,16 +62,15 @@ and the second contains code for module created by the
 \item \verb{tests/} contains various tests for the application. You may
 choose to use or remove any of them. They can be executed by the
 \code{\link[=runTests]{runTests()}} function.
+\item \code{tests/shinytest.R} is a test runner for test files in the
+\verb{tests/shinytest/} directory.
+\item \code{tests/shinytest/mytest.R} is a test that uses the
+\href{https://rstudio.github.io/shinytest/}{shinytest} package to do
+snapshot-based testing.
 \item \code{tests/testthat.R} is a test runner for test files in the
-\verb{tests/testthat/} directory using the
-\href{https://rstudio.github.io/shinytest2/reference/test_app.html}{shinytest2}
-package.
-\item \code{tests/testthat/setup-shinytest2.R} is setup file to source your \code{./R} folder into the testing environment.
+\verb{tests/testthat/} directory using the \href{https://testthat.r-lib.org/}{testthat} package.
 \item \code{tests/testthat/test-examplemodule.R} is a test for an application's module server function.
 \item \code{tests/testthat/test-server.R} is a test for the application's server code
-\item \code{tests/testthat/test-shinytest2.R} is a test that uses the
-\href{https://rstudio.github.io/shinytest2/}{shinytest2} package to do
-snapshot-based testing.
 \item \code{tests/testthat/test-sort.R} is a test for a supporting function in the \verb{R/} directory.
 }
 }

man/shinyOptions.Rd

@@ -73,10 +73,6 @@ then jQuery 3.6.0 is used.}
 numbers to JSON format to send to the client web browser.}
 \item{shiny.launch.browser (defaults to \code{interactive()})}{A boolean which controls the default behavior
 when an app is run. See \code{\link[=runApp]{runApp()}} for more information.}
-\item{shiny.mathjax.url (defaults to \code{"https://mathjax.rstudio.com/latest/MathJax.js"})}{
-The URL that should be used to load MathJax, via \code{\link[=withMathJax]{withMathJax()}}.}
-\item{shiny.mathjax.config (defaults to \code{"config=TeX-AMS-MML_HTMLorMML"})}{The querystring
-used to load MathJax, via \code{\link[=withMathJax]{withMathJax()}}.}
 \item{shiny.maxRequestSize (defaults to 5MB)}{This is a number which specifies the maximum
 web request size, which serves as a size limit for file uploads.}
 \item{shiny.minified (defaults to \code{TRUE})}{By default
@@ -119,10 +115,9 @@ values are \code{"send"} (only print messages sent to the client),
 messages).}
 \item{shiny.autoload.r (defaults to \code{TRUE})}{If \code{TRUE}, then the R/
 of a shiny app will automatically be sourced.}
-\item{shiny.useragg (defaults to \code{TRUE})}{Set to \code{FALSE} to prevent PNG rendering via the
-ragg package. See \code{\link[=plotPNG]{plotPNG()}} for more information.}
-\item{shiny.usecairo (defaults to \code{TRUE})}{Set to \code{FALSE} to prevent PNG rendering via the
-Cairo package. See \code{\link[=plotPNG]{plotPNG()}} for more information.}
+\item{shiny.usecairo (defaults to \code{TRUE})}{This is used to disable graphical rendering by the
+Cairo package, if it is installed. See \code{\link[=plotPNG]{plotPNG()}} for more
+information.}
 \item{shiny.devmode (defaults to \code{NULL})}{Option to enable Shiny Developer Mode. When set,
 different default \code{getOption(key)} values will be returned. See \code{\link[=devmode]{devmode()}} for more details.}
 }

man/shinyServer.Rd

@@ -11,7 +11,7 @@ shinyServer(func)
 for more information.}
 }
 \description{
-\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#superseded}{\figure{lifecycle-superseded.svg}{options: alt='[Superseded]'}}}{\strong{[Superseded]}}
+\lifecycle{superseded}
 
 Defines the server-side logic of the Shiny application. This generally
 involves creating functions that map user inputs to various kinds of output.
@@ -31,7 +31,7 @@ the Shiny application's page. It must take an \code{input} and an
 optional \code{session} parameter, which is used when greater control is
 needed.
 
-See the \href{https://shiny.rstudio.com/tutorial/}{tutorial} for more
+See the \href{https://rstudio.github.io/shiny/tutorial/}{tutorial} for more
 on how to write a server function.
 }
 \examples{

man/shinyUI.Rd

@@ -13,7 +13,7 @@ shinyUI(ui)
 The user interface definition, without modifications or side effects.
 }
 \description{
-\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#superseded}{\figure{lifecycle-superseded.svg}{options: alt='[Superseded]'}}}{\strong{[Superseded]}}
+\lifecycle{superseded}
 
 Historically this function was used in ui.R files to register a user
 interface with Shiny. It is no longer required as of Shiny 0.10; simply