devtools::document() (GitHub Actions)

* Fix two typos in insertUI() docs

* document()

Co-authored-by: Carson Sievert <cpsievert1@gmail.com>

.eslintrc.yml

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

.yarnrc.yml

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

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.7.2.9000
+Version: 1.7.4.9002
 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.2.1),
-    htmltools (>= 0.5.2),
+    fontawesome (>= 0.4.0),
+    htmltools (>= 0.5.4),
     R6 (>= 2.0),
     sourcetools,
     later (>= 1.0.0),
@@ -87,7 +87,7 @@ Imports:
     tools,
     crayon,
     rlang (>= 0.4.10),
-    fastmap (>= 1.1.0),
+    fastmap (>= 1.1.1),
     withr,
     commonmark (>= 1.7),
     glue (>= 1.3.2),
@@ -198,13 +198,14 @@ 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.1
+RoxygenNote: 7.2.3
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 RdMacros: lifecycle
 Config/testthat/edition: 3
 Config/Needs/check:
-  rstudio/shinytest2
+  shinytest2

NEWS.md

@@ -1,10 +1,48 @@
-shiny 1.7.2.9000
-================
+# shiny 1.7.4.9002
+
+## Full changelog
+
+### Breaking changes
+
+### New features and improvements
+
+* Closed #789: Dynamic UI is now rendered asynchronously, thanks in part to the newly exported `Shiny.renderDependenciesAsync()`, `Shiny.renderHtmlAsync()`, and `Shiny.renderContentAsync()`. Importantly, this means `<script>` tags are now loaded asynchronously (the old way used `XMLHttpRequest`, which is synchronous). In addition, `Shiny` now manages a queue of async tasks (exposed via `Shiny.shinyapp.taskQueue`) so that order of execution is preserved. (#3666)
+
+* For `reactiveValues()` objects, whenever the `$names()` or `$values()` methods are called, the keys are now returned in the order that they were inserted. (#3774)
+
+* `Map` objects are now initialized at load time instead of build time. This avoids potential problems that could arise from storing `fastmap` objects into the built Shiny package. (#3775)
+
+### Bug fixes
+
+* Fixed #3771: Sometimes the error `ion.rangeSlider.min.js: i.stopPropagation is not a function` would appear in the JavaScript console. (#3772)
+
+# 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
 
-shiny 1.7.2
-===========
+### 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
 
@@ -55,8 +93,7 @@ shiny 1.7.2
 * HTML dependencies that are sent to dynamic UI now have better type checking, and no longer require a `dep.src.href` field. (#3537)
 
 
-shiny 1.7.1
-===========
+# shiny 1.7.1
 
 ## Bug Fixes
 
@@ -65,8 +102,7 @@ shiny 1.7.1
 * Re-arranged conditions for testthat 1.0.0 compatibility. (#3512)
 
 
-shiny 1.7.0
-===========
+# shiny 1.7.0
 
 ## Full changelog
 
@@ -123,8 +159,7 @@ shiny 1.7.0
 
 * Updated to jQuery 3.6.0. (#3311)
 
-shiny 1.6.0
-===========
+# shiny 1.6.0
 
 This release focuses on improvements in three main areas:
 
@@ -233,8 +268,7 @@ 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
 
@@ -287,20 +321,17 @@ shiny 1.5.0
 * 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
 
@@ -363,8 +394,7 @@ shiny 1.4.0
 * 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
 
@@ -373,8 +403,7 @@ shiny 1.3.2
 * 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
 
@@ -383,8 +412,7 @@ shiny 1.3.1
 * 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
 
@@ -415,8 +443,7 @@ shiny 1.3.0
 * 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.
 
@@ -481,8 +508,7 @@ 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.
 
@@ -555,8 +581,7 @@ 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
 
@@ -569,8 +594,7 @@ shiny 1.0.5
 * 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.
 
@@ -631,8 +655,7 @@ 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.
 
@@ -645,8 +668,7 @@ 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/.
 
@@ -665,8 +687,7 @@ 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.
 
@@ -736,8 +757,7 @@ 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.
 
@@ -802,8 +822,7 @@ 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.
 
@@ -831,8 +850,7 @@ 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.
 
@@ -862,8 +880,7 @@ 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!
 
@@ -1062,14 +1079,12 @@ 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.
 
@@ -1078,8 +1093,7 @@ shiny 0.13.1
 * 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).
 
@@ -1130,8 +1144,7 @@ shiny 0.13.0
 * 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.
 
@@ -1154,16 +1167,14 @@ shiny 0.12.2
 * 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.
 
@@ -1219,8 +1230,7 @@ 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)
 
@@ -1247,8 +1257,7 @@ shiny 0.11.1
 * 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.
 
@@ -1326,20 +1335,17 @@ 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.
 
@@ -1372,8 +1378,7 @@ shiny 0.10.2
 * 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,8 +1391,7 @@ shiny 0.10.1
 * 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.
 
@@ -1424,14 +1428,12 @@ shiny 0.10.0
 * `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).
 
@@ -1504,8 +1506,7 @@ shiny 0.9.0
 * 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.
 
@@ -1524,8 +1525,7 @@ shiny 0.8.0
 * 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.
 
@@ -1554,8 +1554,7 @@ shiny 0.7.0
 * 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.
 
@@ -1586,8 +1585,7 @@ shiny 0.6.0
 * 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.
 
@@ -1604,16 +1602,14 @@ shiny 0.5.0
 * 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.
 
@@ -1628,8 +1624,7 @@ shiny 0.4.0
 * 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.
 
@@ -1638,8 +1633,7 @@ shiny 0.3.1
 * 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.
 
@@ -1664,52 +1658,44 @@ shiny 0.3.0
 * 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
 
@@ -1718,8 +1704,7 @@ shiny 0.1.12
 * Add CSS hooks for app-wide busy indicators
 
 
-shiny 0.1.11
-===========
+# shiny 0.1.11
 
 * Fix input binding with IE8 on Shiny Server
 
@@ -1728,8 +1713,7 @@ shiny 0.1.11
 * 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
 
@@ -1742,8 +1726,7 @@ shiny 0.1.10
 * Fix plot rendering with IE8 on Shiny Server
 
 
-shiny 0.1.9
-===========
+# shiny 0.1.9
 
 * Much less flicker when updating plots
 
@@ -1752,8 +1735,7 @@ shiny 0.1.9
 * 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.
 
@@ -1766,8 +1748,7 @@ shiny 0.1.8
 * 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.
 
@@ -1776,8 +1757,7 @@ shiny 0.1.7
 * 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).
 
@@ -1786,8 +1766,7 @@ shiny 0.1.6
 * 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.
 
@@ -1802,8 +1781,7 @@ shiny 0.1.5
 * 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
 
@@ -1816,8 +1794,7 @@ shiny 0.1.4
 * 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
 
@@ -1830,7 +1807,6 @@ shiny 0.1.3
 * Fix issue #10: Plots in tabsets not rendered
 
 
-shiny 0.1.2
-===========
+# shiny 0.1.2
 
 * Initial private beta release!

R/app-state.R

@@ -7,6 +7,17 @@ NULL
 
 .globals$appState <- NULL
 
+#' Check whether a Shiny application is running
+#'
+#' This function tests whether a Shiny application is currently running.
+#'
+#' @return `TRUE` if a Shiny application is currently running. Otherwise,
+#'   `FALSE`.
+#' @export
+isRunning <- function() {
+  !is.null(getCurrentAppState())
+}
+
 initCurrentAppState <- function(appobj) {
   if (!is.null(.globals$appState)) {
     stop("Can't initialize current app state when another is currently active.")
@@ -21,6 +32,14 @@ getCurrentAppState <- function() {
   .globals$appState
 }
 
+getCurrentAppStateOptions <- function() {
+  .globals$appState$options
+}
+setCurrentAppStateOptions <- function(options) {
+  stopifnot(isRunning())
+  .globals$appState$options <- options
+}
+
 clearCurrentAppState <- function() {
   .globals$appState <- NULL
 }

R/app_template.R

@@ -25,6 +25,7 @@
 #' `- tests
 #'     |- testthat.R
 #'     `- testthat
+#'         |- setup-shinytest2.R
 #'         |- test-examplemodule.R
 #'         |- test-server.R
 #'         |- test-shinytest2.R
@@ -46,6 +47,7 @@
 #'   `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/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
@@ -126,7 +128,7 @@ shinyAppTemplate <- function(path = NULL, examples = "default", dryrun = FALSE)
   }
 
   if ("tests" %in% examples) {
-    rlang::check_installed("shinytest2", "for {testthat} tests to work as expected")
+    rlang::check_installed("shinytest2", "for {testthat} tests to work as expected", version = "0.2.0")
   }
 
   # =======================================================

R/bookmark-state.R

@@ -452,8 +452,10 @@ RestoreInputSet <- R6Class("RestoreInputSet",
   )
 )
 
-# This is a fastmap::faststack(); value is assigned in .onLoad().
 restoreCtxStack <- NULL
+on_load({
+    restoreCtxStack <- fastmap::faststack()
+})
 
 withRestoreContext <- function(ctx, expr) {
   restoreCtxStack$push(ctx)

R/bootstrap.R

@@ -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) {
+                        inline = FALSE, fill = FALSE) {
 
   style <- if (!inline) {
     # Using `css()` here instead of paste/sprintf so that NULL values will
@@ -850,7 +850,8 @@ imageOutput <- function(outputId, width = "100%", height="400px",
   }
 
   container <- if (inline) span else div
-  do.call(container, args)
+  res <- do.call(container, args)
+  bindFillRole(res, item = fill)
 }
 
 #' Create an plot or image output element
@@ -918,6 +919,11 @@ 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
@@ -1088,11 +1094,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) {
+                       inline = FALSE, fill = !inline) {
 
   # Result is the same as imageOutput, except for HTML class
   res <- imageOutput(outputId, width, height, click, dblclick,
-                     hover, brush, inline)
+                     hover, brush, inline, fill)
 
   res$attribs$class <- "shiny-plot-output"
   res
@@ -1135,15 +1141,21 @@ 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
@@ -1155,12 +1167,16 @@ dataTableOutput <- function(outputId) {
 #' )
 #' @export
 htmlOutput <- function(outputId, inline = FALSE,
-  container = if (inline) span else div, ...)
+  container = if (inline) span else div, fill = FALSE, ...)
 {
   if (any_unnamed(list(...))) {
     warning("Unnamed elements in ... will be replaced with dynamic UI.")
   }
-  container(id = outputId, class="shiny-html-output", ...)
+  res <- container(id = outputId, class = "shiny-html-output", ...)
+  bindFillRole(
+    res, item = isTRUE(fill) || isTRUE("item" == fill),
+    container = isTRUE(fill) || isTRUE("container" == fill)
+  )
 }
 
 #' @rdname htmlOutput
@@ -1184,19 +1200,25 @@ uiOutput <- htmlOutput
 #' @examples
 #' \dontrun{
 #' ui <- fluidPage(
+#'   p("Choose a dataset to download."),
+#'   selectInput("dataset", "Dataset", choices = c("mtcars", "airquality")),
 #'   downloadButton("downloadData", "Download")
 #' )
 #'
 #' server <- function(input, output) {
-#'   # Our dataset
-#'   data <- mtcars
+#'   # The requested dataset
+#'   data <- reactive({
+#'     get(input$dataset)
+#'   })
 #'
 #'   output$downloadData <- downloadHandler(
 #'     filename = function() {
-#'       paste("data-", Sys.Date(), ".csv", sep="")
+#'       # Use the selected dataset as the suggested file name
+#'       paste0(input$dataset, ".csv")
 #'     },
 #'     content = function(file) {
-#'       write.csv(data, file)
+#'       # Write the dataset to the `file` that will be downloaded
+#'       write.csv(data(), file)
 #'     }
 #'   )
 #' }

R/devmode.R

@@ -1,6 +1,6 @@
 #' Shiny Developer Mode
 #'
-#' @description \lifecycle{experimental}
+#' @description `r lifecycle::badge("experimental")`
 #'
 #'   Developer Mode enables a number of [options()] to make a developer's life
 #'   easier, like enabling non-minified JS and printing messages about
@@ -190,8 +190,10 @@ devmode_inform <- function(
 
 
 
-#' @include map.R
-registered_devmode_options <- Map$new()
+registered_devmode_options <- NULL
+on_load({
+  registered_devmode_options <- Map$new()
+})
 
 #' @describeIn devmode Registers a Shiny Developer Mode option with an updated
 #'   value and Developer message. This registration method allows package
@@ -340,21 +342,22 @@ get_devmode_option <- function(
 }
 
 
+on_load({
+  register_devmode_option(
+    "shiny.autoreload",
+    "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
+    TRUE
+  )
 
-register_devmode_option(
-  "shiny.autoreload",
-  "Turning on shiny autoreload. To disable, call `options(shiny.autoreload = FALSE)`",
-  TRUE
-)
+  register_devmode_option(
+    "shiny.minified",
+    "Using full shiny javascript file. To use the minified version, call `options(shiny.minified = TRUE)`",
+    FALSE
+  )
 
-register_devmode_option(
-  "shiny.minified",
-  "Using full shiny javascript file. To use the minified version, call `options(shiny.minified = TRUE)`",
-  FALSE
-)
-
-register_devmode_option(
-  "shiny.fullstacktrace",
-  "Turning on full stack trace. To disable, call `options(shiny.fullstacktrace = FALSE)`",
-  TRUE
-)
+  register_devmode_option(
+    "shiny.fullstacktrace",
+    "Turning on full stack trace. To disable, call `options(shiny.fullstacktrace = FALSE)`",
+    TRUE
+  )
+})

R/globals.R

@@ -7,9 +7,9 @@
   # the private seed during load.
   withPrivateSeed(set.seed(NULL))
 
-  # Create this at the top level, but since the object is from a different
-  # package, we don't want to bake it into the built binary package.
-  restoreCtxStack <<- fastmap::faststack()
+  for (expr in on_load_exprs) {
+    eval(expr, envir = environment(.onLoad))
+  }
 
   # Make sure these methods are available to knitr if shiny is loaded but not
   # attached.
@@ -23,3 +23,11 @@
   # https://github.com/rstudio/shiny/issues/2630
   register_upgrade_message("htmlwidgets", 1.5)
 }
+
+
+on_load_exprs <- list()
+# Register an expression to be evaluated when the package is loaded (in the
+# .onLoad function).
+on_load <- function(expr) {
+  on_load_exprs[[length(on_load_exprs) + 1]] <<- substitute(expr)
+}

R/graph.R

@@ -559,4 +559,6 @@ MessageLogger = R6Class(
   )
 )
 
-rLog <- RLog$new("shiny.reactlog", "shiny.reactlog.console")
+on_load({
+  rLog <- RLog$new("shiny.reactlog", "shiny.reactlog.console")
+})

R/image-interact.R

@@ -182,8 +182,8 @@ brushedPoints <- function(df, brush, xvar = NULL, yvar = NULL,
 #  $ xmax     : num 3.78
 #  $ ymin     : num 17.1
 #  $ ymax     : num 20.4
-#  $ panelvar1: int 6
-#  $ panelvar2: int 0
+#  $ panelvar1: chr "6"
+#  $ panelvar2: chr "0
 #  $ coords_css:List of 4
 #   ..$ xmin: int 260
 #   ..$ xmax: int 298
@@ -367,8 +367,8 @@ nearPoints <- function(df, coordinfo, xvar = NULL, yvar = NULL,
 #  $ img_css_ratio:List of 2
 #   ..$ x: num 1.25
 #   ..$ y: num 1.25
-#  $ panelvar1 : int 6
-#  $ panelvar2 : int 0
+#  $ panelvar1 : chr "6"
+#  $ panelvar2 : chr "0"
 #  $ mapping   :List of 4
 #   ..$ x        : chr "wt"
 #   ..$ y        : chr "mpg"

R/imageutils.R

@@ -11,7 +11,13 @@ startPNG <- function(filename, width, height, res, ...) {
     grDevices::png
   }
 
-  args <- rlang::list2(filename=filename, width=width, height=height, res=res, ...)
+  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
 
   # 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
@@ -64,6 +70,10 @@ startPNG <- function(filename, width, height, res, ...) {
 #'   * Otherwise, use [grDevices::png()]. In this case, Linux and Windows
 #'    may not antialias some point shapes, resulting in poor quality output.
 #'
+#' @details
+#'   A `NULL` value provided to `width` or `height` is ignored (i.e., the
+#'   default `width` or `height` of the graphics device is used).
+#'
 #' @param func A function that generates a plot.
 #' @param filename The name of the output file. Defaults to a temp file with
 #'   extension `.png`.

R/insert-ui.R

@@ -1,6 +1,6 @@
 #' Insert and remove UI objects
 #'
-#' These functions allow you to dynamically add and remove arbirary UI
+#' These functions allow you to dynamically add and remove arbitrary UI
 #' into your app, whenever you want, as many times as you want.
 #' Unlike [renderUI()], the UI generated with `insertUI()` is persistent:
 #' once it's created, it stays there until removed by `removeUI()`. Each
@@ -11,7 +11,7 @@
 #' function.
 #'
 #' It's particularly useful to pair `removeUI` with `insertUI()`, but there is
-#' no restriction on what you can use on. Any element that can be selected
+#' no restriction on what you can use it on. Any element that can be selected
 #' through a jQuery selector can be removed through this function.
 #'
 #' @param selector A string that is accepted by jQuery's selector

R/jqueryui.R

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

R/mock-session.R

@@ -274,7 +274,7 @@ MockShinySession <- R6Class(
       self$token <- createUniqueId(16)
 
       # Copy app-level options
-      self$options <- getCurrentAppState()$options
+      self$options <- getCurrentAppStateOptions()
 
       self$cache <- cachem::cache_mem()
       self$appcache <- cachem::cache_mem()

R/modal.R

@@ -43,7 +43,10 @@ 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,
-#'   or `"l"` for large.
+#'   `"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()]).
 #' @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

@@ -326,6 +326,9 @@ ReactiveValues <- R6Class(
     .dedupe = logical(0),
     # Key, asList(), or names() have been retrieved
     .hasRetrieved = list(),
+    # All names, in insertion order. The names are also stored in the .values
+    # object, but it does not preserve order.
+    .nameOrder = character(0),
 
 
     initialize = function(
@@ -403,6 +406,11 @@ ReactiveValues <- R6Class(
         return(invisible())
       }
 
+      # If it's new, append key to the name order
+      if (!key_exists) {
+        .nameOrder[length(.nameOrder) + 1] <<- key
+      }
+
       # set the value for better logging
       .values$set(key, value)
 
@@ -444,14 +452,13 @@ ReactiveValues <- R6Class(
     },
 
     names = function() {
-      nameValues <- .values$keys()
       if (!isTRUE(.hasRetrieved$names)) {
         domain <- getDefaultReactiveDomain()
-        rLog$defineNames(.reactId, nameValues, .label, domain)
+        rLog$defineNames(.reactId, .nameOrder, .label, domain)
         .hasRetrieved$names <<- TRUE
       }
       .namesDeps$register()
-      return(nameValues)
+      return(.nameOrder)
     },
 
     # Get a metadata value. Does not trigger reactivity.
@@ -499,7 +506,7 @@ ReactiveValues <- R6Class(
     },
 
     toList = function(all.names=FALSE) {
-      listValue <- .values$values()
+      listValue <- .values$mget(.nameOrder)
       if (!all.names) {
         listValue <- listValue[!grepl("^\\.", base::names(listValue))]
       }

R/render-plot.R

@@ -194,8 +194,8 @@ renderPlot <- function(expr, width = 'auto', height = 'auto', res = 72, ...,
 }
 
 resizeSavedPlot <- function(name, session, result, width, height, alt, pixelratio, res, ...) {
-  if (result$img$width == width && result$img$height == height &&
-      result$pixelratio == pixelratio && result$res == res) {
+  if (isTRUE(result$img$width == width && result$img$height == height &&
+      result$pixelratio == pixelratio && result$res == res)) {
     return(result)
   }
 

R/server-input-handlers.R

@@ -1,5 +1,9 @@
-# Create a map for input handlers and register the defaults.
-inputHandlers <- Map$new()
+# Create a Map object for input handlers and register the defaults.
+# This is assigned in .onLoad time.
+inputHandlers <- NULL
+on_load({
+  inputHandlers <- Map$new()
+})
 
 #' Register an Input Handler
 #'
@@ -125,115 +129,117 @@ applyInputHandlers <- function(inputs, shinysession = getDefaultReactiveDomain()
   inputs
 }
 
+on_load({
+  # Takes a list-of-lists and returns a matrix. The lists
+  # must all be the same length. NULL is replaced by NA.
+  registerInputHandler("shiny.matrix", function(data, ...) {
+    if (length(data) == 0)
+      return(matrix(nrow=0, ncol=0))
 
-# Takes a list-of-lists and returns a matrix. The lists
-# must all be the same length. NULL is replaced by NA.
-registerInputHandler("shiny.matrix", function(data, ...) {
-  if (length(data) == 0)
-    return(matrix(nrow=0, ncol=0))
-
-  m <- matrix(unlist(lapply(data, function(x) {
-    sapply(x, function(y) {
-      ifelse(is.null(y), NA, y)
-    })
-  })), nrow = length(data[[1]]), ncol = length(data))
-  return(m)
-})
-
-
-registerInputHandler("shiny.number", function(val, ...){
-  ifelse(is.null(val), NA, val)
-})
-
-registerInputHandler("shiny.password", function(val, shinysession, name) {
-  # Mark passwords as not serializable
-  setSerializer(name, serializerUnserializable)
-  val
-})
-
-registerInputHandler("shiny.date", function(val, ...){
-  # First replace NULLs with NA, then convert to Date vector
-  datelist <- ifelse(lapply(val, is.null), NA, val)
-
-  res <- NULL
-  tryCatch({
-      res <- as.Date(unlist(datelist))
-    },
-    error = function(e) {
-      # It's possible for client to send a string like "99999-01-01", which
-      # as.Date can't handle.
-      warning(e$message)
-      res <<- as.Date(rep(NA, length(datelist)))
-    }
-  )
-
-  res
-})
-
-registerInputHandler("shiny.datetime", function(val, ...){
-  # First replace NULLs with NA, then convert to POSIXct vector
-  times <- lapply(val, function(x) {
-    if (is.null(x)) NA
-    else x
+    m <- matrix(unlist(lapply(data, function(x) {
+      sapply(x, function(y) {
+        ifelse(is.null(y), NA, y)
+      })
+    })), nrow = length(data[[1]]), ncol = length(data))
+    return(m)
   })
-  as.POSIXct(unlist(times), origin = "1970-01-01", tz = "UTC")
-})
-
-registerInputHandler("shiny.action", function(val, shinysession, name) {
-  # mark up the action button value with a special class so we can recognize it later
-  class(val) <- c("shinyActionButtonValue", class(val))
-  val
-})
-
-registerInputHandler("shiny.file", function(val, shinysession, name) {
-  # This function is only used when restoring a Shiny fileInput. When a file is
-  # uploaded the usual way, it takes a different code path and won't hit this
-  # function.
-  if (is.null(val))
-    return(NULL)
-
-  # The data will be a named list of lists; convert to a data frame.
-  val <- as.data.frame(lapply(val, unlist), stringsAsFactors = FALSE)
-
-  # `val$datapath` should be a filename without a path, for security reasons.
-  if (basename(val$datapath) != val$datapath) {
-    stop("Invalid '/' found in file input path.")
-  }
-
-  # Prepend the persistent dir
-  oldfile <- file.path(getCurrentRestoreContext()$dir, val$datapath)
-
-  # Copy the original file to a new temp dir, so that a restored session can't
-  # modify the original.
-  newdir <- file.path(tempdir(), createUniqueId(12))
-  dir.create(newdir)
-  val$datapath <- file.path(newdir, val$datapath)
-  file.copy(oldfile, val$datapath)
-
-  # Need to mark this input value with the correct serializer. When a file is
-  # uploaded the usual way (instead of being restored), this occurs in
-  # session$`@uploadEnd`.
-  setSerializer(name, serializerFileInput)
-
-  snapshotPreprocessInput(name, snapshotPreprocessorFileInput)
-
-  val
-})
-
-
-# to be used with !!!answer
-registerInputHandler("shiny.symbolList", function(val, ...) {
-  if (is.null(val)) {
-    list()
-  } else {
-    lapply(val, as.symbol)
-  }
-})
-# to be used with !!answer
-registerInputHandler("shiny.symbol", function(val, ...) {
-  if (is.null(val) || identical(val, "")) {
-    NULL
-  } else {
-    as.symbol(val)
-  }
+
+
+  registerInputHandler("shiny.number", function(val, ...){
+    ifelse(is.null(val), NA, val)
+  })
+
+  registerInputHandler("shiny.password", function(val, shinysession, name) {
+    # Mark passwords as not serializable
+    setSerializer(name, serializerUnserializable)
+    val
+  })
+
+  registerInputHandler("shiny.date", function(val, ...){
+    # First replace NULLs with NA, then convert to Date vector
+    datelist <- ifelse(lapply(val, is.null), NA, val)
+
+    res <- NULL
+    tryCatch({
+        res <- as.Date(unlist(datelist))
+      },
+      error = function(e) {
+        # It's possible for client to send a string like "99999-01-01", which
+        # as.Date can't handle.
+        warning(e$message)
+        res <<- as.Date(rep(NA, length(datelist)))
+      }
+    )
+
+    res
+  })
+
+  registerInputHandler("shiny.datetime", function(val, ...){
+    # First replace NULLs with NA, then convert to POSIXct vector
+    times <- lapply(val, function(x) {
+      if (is.null(x)) NA
+      else x
+    })
+    as.POSIXct(unlist(times), origin = "1970-01-01", tz = "UTC")
+  })
+
+  registerInputHandler("shiny.action", function(val, shinysession, name) {
+    # mark up the action button value with a special class so we can recognize it later
+    class(val) <- c("shinyActionButtonValue", class(val))
+    val
+  })
+
+  registerInputHandler("shiny.file", function(val, shinysession, name) {
+    # This function is only used when restoring a Shiny fileInput. When a file is
+    # uploaded the usual way, it takes a different code path and won't hit this
+    # function.
+    if (is.null(val))
+      return(NULL)
+
+    # The data will be a named list of lists; convert to a data frame.
+    val <- as.data.frame(lapply(val, unlist), stringsAsFactors = FALSE)
+
+    # `val$datapath` should be a filename without a path, for security reasons.
+    if (basename(val$datapath) != val$datapath) {
+      stop("Invalid '/' found in file input path.")
+    }
+
+    # Prepend the persistent dir
+    oldfile <- file.path(getCurrentRestoreContext()$dir, val$datapath)
+
+    # Copy the original file to a new temp dir, so that a restored session can't
+    # modify the original.
+    newdir <- file.path(tempdir(), createUniqueId(12))
+    dir.create(newdir)
+    val$datapath <- file.path(newdir, val$datapath)
+    file.copy(oldfile, val$datapath)
+
+    # Need to mark this input value with the correct serializer. When a file is
+    # uploaded the usual way (instead of being restored), this occurs in
+    # session$`@uploadEnd`.
+    setSerializer(name, serializerFileInput)
+
+    snapshotPreprocessInput(name, snapshotPreprocessorFileInput)
+
+    val
+  })
+
+
+  # to be used with !!!answer
+  registerInputHandler("shiny.symbolList", function(val, ...) {
+    if (is.null(val)) {
+      list()
+    } else {
+      lapply(val, as.symbol)
+    }
+  })
+  # to be used with !!answer
+  registerInputHandler("shiny.symbol", function(val, ...) {
+    if (is.null(val) || identical(val, "")) {
+      NULL
+    } else {
+      as.symbol(val)
+    }
+  })
+
 })

R/server.R

@@ -1,7 +1,12 @@
 #' @include server-input-handlers.R
 
-appsByToken <- Map$new()
-appsNeedingFlush <- Map$new()
+appsByToken <- NULL
+appsNeedingFlush <- NULL
+on_load({
+  appsByToken <- Map$new()
+  appsNeedingFlush <- Map$new()
+})
+
 
 # Provide a character representation of the WS that can be used
 # as a key in a Map.
@@ -29,7 +34,7 @@ registerClient <- function(client) {
 
 #' Define Server Functionality
 #'
-#' @description \lifecycle{superseded}
+#' @description `r lifecycle::badge("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.
@@ -122,7 +127,10 @@ decodeMessage <- function(data) {
   return(mainMessage)
 }
 
-autoReloadCallbacks <- Callbacks$new()
+autoReloadCallbacks <- NULL
+on_load({
+  autoReloadCallbacks <- Callbacks$new()
+})
 
 createAppHandlers <- function(httpHandlers, serverFuncSource) {
   appvars <- new.env()
@@ -487,16 +495,6 @@ serviceApp <- function() {
 
 .shinyServerMinVersion <- '0.3.4'
 
-#' Check whether a Shiny application is running
-#'
-#' This function tests whether a Shiny application is currently running.
-#'
-#' @return `TRUE` if a Shiny application is currently running. Otherwise,
-#'   `FALSE`.
-#' @export
-isRunning <- function() {
-  !is.null(getCurrentAppState())
-}
 
 
 # Returns TRUE if we're running in Shiny Server or other hosting environment,

R/shiny-options.R

@@ -19,10 +19,10 @@ getShinyOption <- function(name, default = NULL) {
   }
 
   # Check if there's a current app
-  app_state <- getCurrentAppState()
-  if (!is.null(app_state)) {
-    if (name %in% names(app_state$options)) {
-      return(app_state$options[[name]])
+  if (isRunning()) {
+    app_state_options <- getCurrentAppStateOptions()
+    if (name %in% names(app_state_options)) {
+      return(app_state_options[[name]])
     } else {
       return(default)
     }
@@ -199,11 +199,12 @@ shinyOptions <- function(...) {
 
     # If not in a session, but we have a currently running app, modify options
     # at the app level.
-    app_state <- getCurrentAppState()
-    if (!is.null(app_state)) {
+    if (isRunning()) {
       # Modify app-level options
-      app_state$options <- dropNulls(mergeVectors(app_state$options, newOpts))
-      return(invisible(app_state$options))
+      setCurrentAppStateOptions(
+        dropNulls(mergeVectors(getCurrentAppStateOptions(), newOpts))
+      )
+      return(invisible(getCurrentAppStateOptions()))
     }
 
     # If no currently running app, modify global options and return them.
@@ -218,9 +219,8 @@ shinyOptions <- function(...) {
     return(session$options)
   }
 
-  app_state <- getCurrentAppState()
-  if (!is.null(app_state)) {
-    return(app_state$options)
+  if (isRunning()) {
+    return(getCurrentAppStateOptions())
   }
 
   return(.globals$options)

R/shiny.R

@@ -185,9 +185,11 @@ workerId <- local({
 #'   session is actually connected.
 #' }
 #' \item{request}{
-#'   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).
+#'   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).
 #' }
 #' \item{userData}{
 #'   An environment for app authors and module/package authors to store whatever
@@ -736,7 +738,7 @@ ShinySession <- R6Class(
       private$.outputOptions <- list()
 
       # Copy app-level options
-      self$options <- getCurrentAppState()$options
+      self$options <- getCurrentAppStateOptions()
 
       self$cache <- cachem::cache_mem(max_size = 200 * 1024^2)
 

R/shinyui.R

@@ -148,7 +148,7 @@ shinyDependencyCSS <- function(theme) {
 
 #' Create a Shiny UI handler
 #'
-#' @description \lifecycle{superseded}
+#' @description `r lifecycle::badge("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/version_jqueryui.R

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

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

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

inst/www/shared/ionrangeslider/js/ion.rangeSlider.js

@@ -753,7 +753,7 @@
                 x = $handle.offset().left;
                 x += ($handle.width() / 2) - 1;
 
-                this.pointerClick("single", {preventDefault: function () {}, pageX: x});
+                this.pointerClick("single", {preventDefault: function () {}, stopPropagation: function () {}, pageX: x});
             }
         },
 

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 <m.goleb@gmail.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
 Alyosha Pushak <alyosha.pushak@gmail.com>
 Fahad Ahmad <fahadahmad41@hotmail.com>
 Matt Brundage <github@mattbrundage.com>
@@ -331,3 +331,42 @@ 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

@@ -1,5 +0,0 @@
-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,7 +58,6 @@
 
 <h1>YOUR COMPONENTS:</h1>
 
-
 <!-- Accordion -->
 <h2 class="demoHeaders">Accordion</h2>
 <div id="accordion">
@@ -70,23 +69,17 @@
 	<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;">
@@ -97,8 +90,6 @@
 	</div>
 </form>
 
-
-
 <!-- Controlgroup -->
 <h2 class="demoHeaders">Controlgroup</h2>
 <fieldset>
@@ -125,8 +116,6 @@
 	</div>
 </fieldset>
 
-
-
 <!-- Tabs -->
 <h2 class="demoHeaders">Tabs</h2>
 <div id="tabs">
@@ -140,8 +129,6 @@
 	<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">
@@ -167,7 +154,6 @@
 </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>
@@ -345,25 +331,18 @@
 	<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">
@@ -374,14 +353,10 @@
 	<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">
@@ -400,8 +375,6 @@
 	<li><div>Item 5</div></li>
 </ul>
 
-
-
 <!-- Tooltip -->
 <h2 class="demoHeaders">Tooltip</h2>
 <p id="tooltip">
@@ -409,7 +382,6 @@
 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">
@@ -429,11 +401,8 @@ 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",
@@ -462,28 +431,18 @@ $( "#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,
@@ -509,42 +468,27 @@ $( "#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.12.1 - 2016-09-14
+/*! jQuery UI - v1.13.2 - 2022-07-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;
-	filter:Alpha(Opacity=0); /* support: IE8 */
+	-ms-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%;
-	filter: alpha(opacity=25); /* support: IE8 */
+	-ms-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: default;
+	cursor: pointer;
 	-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;
-	filter:Alpha(Opacity=70); /* support: IE8 */
+	-ms-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;
-	filter:Alpha(Opacity=35); /* support: IE8 */
+	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
+	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -1093,7 +1093,10 @@ a.ui-button:active,
 }
 
 /* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
+/* Three classes needed to override `.ui-button:hover .ui-icon` */
+.ui-icon-blank.ui-icon-blank.ui-icon-blank {
+	background-image: none;
+}
 .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; }
@@ -1304,7 +1307,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	filter: Alpha(Opacity=.3); /* support: IE8 */
+	-ms-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.12.1
+ * jQuery UI CSS Framework 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -49,7 +49,7 @@
 	left: 0;
 	position: absolute;
 	opacity: 0;
-	filter:Alpha(Opacity=0); /* support: IE8 */
+	-ms-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%;
-	filter: alpha(opacity=25); /* support: IE8 */
+	-ms-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: default;
+	cursor: pointer;
 	-ms-touch-action: none;
 	touch-action: none;
 }

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

@@ -1,5 +1,5 @@
 /*!
- * jQuery UI CSS Framework 1.12.1
+ * jQuery UI CSS Framework 1.13.2
  * 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;
-	filter:Alpha(Opacity=70); /* support: IE8 */
+	-ms-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;
-	filter:Alpha(Opacity=35); /* support: IE8 */
+	-ms-filter: "alpha(opacity=35)"; /* support: IE8 */
 	background-image: none;
 }
 .ui-state-disabled .ui-icon {
-	filter:Alpha(Opacity=35); /* support: IE8 - See #6059 */
+	-ms-filter: "alpha(opacity=35)"; /* support: IE8 - See #6059 */
 }
 
 /* Icons
@@ -224,7 +224,10 @@ a.ui-button:active,
 }
 
 /* positioning */
-.ui-icon-blank { background-position: 16px 16px; }
+/* Three classes needed to override `.ui-button:hover .ui-icon` */
+.ui-icon-blank.ui-icon-blank.ui-icon-blank {
+	background-image: none;
+}
 .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; }
@@ -435,7 +438,7 @@ a.ui-button:active,
 .ui-widget-overlay {
 	background: #aaaaaa;
 	opacity: .003;
-	filter: Alpha(Opacity=.3); /* support: IE8 */
+	-ms-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 (i = 0; i < kids.length; i++) {
+              for (var 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 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)}}()});
+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)}}()});

inst/www/shared/shiny-showcase.css

@@ -1,2 +1,2 @@
-/*! shiny 1.7.2 | (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}
+/*! shiny 1.7.4.9002 | (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}

inst/www/shared/shiny-testmode.js

@@ -1,3 +1,3 @@
-/*! shiny 1.7.2 | (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)});})();
+/*! shiny 1.7.4.9002 | (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

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

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../srcts/src/utils/eval.ts", "../../../srcts/extras/shiny-testmode.ts"],
-  "sourcesContent": ["//esbuild.github.io/content-types/#direct-eval\n//tl/dr;\n// * Direct usage of `eval(\"x\")` is bad with bundled code.\n// * Instead, use indirect calls to `eval` such as `indirectEval(\"x\")`\n//   * Even just renaming the function works well enough.\n// > This is known as \"indirect eval\" because eval is not being called directly, and so does not trigger the grammatical special case for direct eval in the JavaScript VM. You can call indirect eval using any syntax at all except for an expression of the exact form eval('x'). For example, var eval2 = eval; eval2('x') and [eval][0]('x') and window.eval('x') are all indirect eval calls.\n// > When you use indirect eval, the code is evaluated in the global scope instead of in the inline scope of the caller.\nvar indirectEval = eval;\nexport { indirectEval };", "/* eslint-disable unicorn/filename-case */\nimport { indirectEval } from \"../src/utils/eval\"; // Listen for messages from parent frame. This file is only added when the\n// shiny.testmode option is TRUE.\n\nwindow.addEventListener(\"message\", function (e) {\n  var message = e.data;\n  if (message.code) indirectEval(message.code);\n});"],
-  "mappings": ";YAOA,GAAI,GAAe,KCHnB,OAAO,iBAAiB,UAAW,SAAU,EAAG,CAC9C,GAAI,GAAU,EAAE,KAChB,AAAI,EAAQ,MAAM,EAAa,EAAQ",
-  "names": []
+  "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.\n\nvar indirectEval = eval;\nexport { indirectEval };", "/* eslint-disable unicorn/filename-case */\nimport { indirectEval } from \"../src/utils/eval\";\n\n// Listen for messages from parent frame. This file is only added when the\n// shiny.testmode option is TRUE.\nwindow.addEventListener(\"message\", function (e) {\n  var message = e.data;\n  if (message.code) indirectEval(message.code);\n});"],
+  "mappings": ";yBAQA,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/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{
-\lifecycle{experimental}
+\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#experimental}{\figure{lifecycle-experimental.svg}{options: alt='[Experimental]'}}}{\strong{[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

man/downloadButton.Rd

@@ -36,19 +36,25 @@ function.
 \examples{
 \dontrun{
 ui <- fluidPage(
+  p("Choose a dataset to download."),
+  selectInput("dataset", "Dataset", choices = c("mtcars", "airquality")),
   downloadButton("downloadData", "Download")
 )
 
 server <- function(input, output) {
-  # Our dataset
-  data <- mtcars
+  # The requested dataset
+  data <- reactive({
+    get(input$dataset)
+  })
 
   output$downloadData <- downloadHandler(
     filename = function() {
-      paste("data-", Sys.Date(), ".csv", sep="")
+      # Use the selected dataset as the suggested file name
+      paste0(input$dataset, ".csv")
     },
     content = function(file) {
-      write.csv(data, file)
+      # Write the dataset to the `file` that will be downloaded
+      write.csv(data(), file)
     }
   )
 }

man/htmlOutput.Rd

@@ -9,10 +9,17 @@ htmlOutput(
   outputId,
   inline = FALSE,
   container = if (inline) span else div,
+  fill = FALSE,
   ...
 )
 
-uiOutput(outputId, inline = FALSE, container = if (inline) span else div, ...)
+uiOutput(
+  outputId,
+  inline = FALSE,
+  container = if (inline) span else div,
+  fill = FALSE,
+  ...
+)
 }
 \arguments{
 \item{outputId}{output variable to read the value from}
@@ -22,6 +29,13 @@ 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.}
 }
@@ -30,12 +44,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/insertUI.Rd

@@ -64,7 +64,7 @@ updated and all observers have been run (default).}
 \item{session}{The shiny session. Advanced use only.}
 }
 \description{
-These functions allow you to dynamically add and remove arbirary UI
+These functions allow you to dynamically add and remove arbitrary UI
 into your app, whenever you want, as many times as you want.
 Unlike \code{\link[=renderUI]{renderUI()}}, the UI generated with \code{insertUI()} is persistent:
 once it's created, it stays there until removed by \code{removeUI()}. Each
@@ -76,7 +76,7 @@ function.
 }
 \details{
 It's particularly useful to pair \code{removeUI} with \code{insertUI()}, but there is
-no restriction on what you can use on. Any element that can be selected
+no restriction on what you can use it on. Any element that can be selected
 through a jQuery selector can be removed through this function.
 }
 \examples{

man/isRunning.Rd

@@ -1,5 +1,5 @@
 % Generated by roxygen2: do not edit by hand
-% Please edit documentation in R/server.R
+% Please edit documentation in R/app-state.R
 \name{isRunning}
 \alias{isRunning}
 \title{Check whether a Shiny application is running}

man/memoryCache.Rd

@@ -17,7 +17,7 @@ memoryCache(
 \arguments{
 \item{max_size}{Maximum size of the cache, in bytes. If the cache exceeds
 this size, cached objects will be removed according to the value of the
-\code{evict}. Use \code{Inf} for no size limit. The default is 1 gigabyte.}
+\code{evict}. Use \code{Inf} for no size limit. The default is 512 megabytes.}
 
 \item{max_age}{Maximum age of files in cache before they are evicted, in
 seconds. Use \code{Inf} for no age limit.}

man/modalDialog.Rd

@@ -24,7 +24,10 @@ 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,
-or \code{"l"} for large.}
+\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()}}).}
 
 \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/plotOutput.Rd

@@ -13,7 +13,8 @@ imageOutput(
   dblclick = NULL,
   hover = NULL,
   brush = NULL,
-  inline = FALSE
+  inline = FALSE,
+  fill = FALSE
 )
 
 plotOutput(
@@ -24,7 +25,8 @@ plotOutput(
   dblclick = NULL,
   hover = NULL,
   brush = NULL,
-  inline = FALSE
+  inline = FALSE,
+  fill = !inline
 )
 }
 \arguments{
@@ -76,6 +78,12 @@ 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

@@ -46,3 +46,7 @@ is not set to \code{FALSE}), then use \code{\link[Cairo:Cairo]{Cairo::CairoPNG()
 may not antialias some point shapes, resulting in poor quality output.
 }
 }
+\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).
+}

man/session.Rd

@@ -96,9 +96,10 @@ The equivalent of hitting the browser's Reload button. Only works if the
 session is actually connected.
 }
 \item{request}{
-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).
+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).
 }
 \item{userData}{
 An environment for app authors and module/package authors to store whatever

man/shinyAppTemplate.Rd

@@ -45,6 +45,7 @@ following files and directories is created:
 `- tests
     |- testthat.R
     `- testthat
+        |- setup-shinytest2.R
         |- test-examplemodule.R
         |- test-server.R
         |- test-shinytest2.R
@@ -67,6 +68,7 @@ choose to use or remove any of them. They can be executed by 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.
 \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

man/shinyServer.Rd

@@ -11,7 +11,7 @@ shinyServer(func)
 for more information.}
 }
 \description{
-\lifecycle{superseded}
+\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#superseded}{\figure{lifecycle-superseded.svg}{options: alt='[Superseded]'}}}{\strong{[Superseded]}}
 
 Defines the server-side logic of the Shiny application. This generally
 involves creating functions that map user inputs to various kinds of output.

man/shinyUI.Rd

@@ -13,7 +13,7 @@ shinyUI(ui)
 The user interface definition, without modifications or side effects.
 }
 \description{
-\lifecycle{superseded}
+\ifelse{html}{\href{https://lifecycle.r-lib.org/articles/stages.html#superseded}{\figure{lifecycle-superseded.svg}{options: alt='[Superseded]'}}}{\strong{[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

package.json

@@ -3,7 +3,7 @@
   "homepage": "https://shiny.rstudio.com",
   "repository": "github:rstudio/shiny",
   "name": "@types/rstudio-shiny",
-  "version": "1.7.2",
+  "version": "1.7.4-alpha.9002",
   "license": "GPL-3.0-only",
   "main": "",
   "browser": "",
@@ -23,7 +23,7 @@
     "@types/bootstrap-datepicker": "0.0.14",
     "@types/datatables.net": "^1.10.19",
     "@types/ion-rangeslider": "2.3.0",
-    "@types/jquery": "patch:@types/jquery@3.5.5#./srcts/patch/types-jquery.patch",
+    "@types/jquery": "3.5.14",
     "@types/selectize": "0.12.34"
   },
   "devDependencies": {
@@ -32,50 +32,47 @@
     "@babel/preset-env": "^7.14.2",
     "@babel/preset-typescript": "^7.13.0",
     "@babel/runtime": "^7.14.0",
-    "@deanc/esbuild-plugin-postcss": "^1.0.1",
+    "@deanc/esbuild-plugin-postcss": "^1.0.2",
     "@testing-library/dom": "^7.31.0",
     "@testing-library/jest-dom": "^5.12.0",
     "@testing-library/user-event": "^13.1.9",
     "@types/highlightjs": "^9.12.1",
     "@types/jest": "^26.0.23",
-    "@types/jqueryui": "1.12.15",
+    "@types/jqueryui": "1.12.16",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.6.1",
+    "@types/node": "^18.14.2",
     "@types/showdown": "^1.9.3",
-    "@typescript-eslint/eslint-plugin": "^4.25.0",
-    "@typescript-eslint/parser": "^4.25.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
     "autoprefixer": "^10.2.6",
-    "bootstrap-datepicker": "1.9.0",
     "browserslist": "^4.19.1",
     "caniuse-lite": "^1.0.30001312",
     "core-js": "^3.13.0",
-    "esbuild": "^0.12.4",
+    "esbuild": "^0.15.10",
     "esbuild-plugin-babel": "https://github.com/schloerke/esbuild-plugin-babel#patch-2",
     "esbuild-plugin-globals": "^0.1.1",
-    "esbuild-plugin-sass": "^0.5.2",
-    "eslint": "^7.27.0",
-    "eslint-config-prettier": "^7.2.0",
-    "eslint-plugin-jest": "^24.3.6",
-    "eslint-plugin-jest-dom": "^3.9.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "eslint-plugin-unicorn": "^33.0.1",
-    "ion-rangeslider": "2.3.1",
+    "esbuild-plugin-sass": "^1.0.1",
+    "eslint": "^8.24.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-jest": "^27.0.4",
+    "eslint-plugin-jest-dom": "^4.0.2",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-unicorn": "^43.0.2",
+    "fs-readdir-recursive": "^1.1.0",
     "jest": "^26.6.3",
-    "jquery": "3.6.0",
+    "jquery": "^3.6.0",
     "lodash": "^4.17.21",
     "madge": "^4.0.2",
     "node-gyp": "^8.1.0",
     "phantomjs-prebuilt": "^2.1.16",
     "postcss": "^8.3.5",
-    "prettier": "2.3.0",
+    "prettier": "^2.7.1",
     "readcontrol": "^1.0.0",
     "replace": "^1.2.1",
-    "selectize": "0.12.4",
-    "strftime": "0.9.2",
     "ts-jest": "^26",
-    "ts-node": "^10.0.0",
-    "type-coverage": "^2.17.5",
-    "typescript": "~4.1.5",
+    "ts-node": "^10.9.1",
+    "type-coverage": "^2.22.0",
+    "typescript": "^4.8.4",
     "util-inspect": "https://github.com/deecewan/browser-util-inspect#c0b4350df4378ffd743e8c36dd3898ce3992823e"
   },
   "scripts": {

srcts/build/_build.ts

@@ -1,13 +1,23 @@
-import {
-  build as esbuildBuild,
+import type {
+  BuildFailure,
   BuildIncremental,
   BuildOptions,
   BuildResult,
+  WatchMode,
 } from "esbuild";
-import readcontrol from "readcontrol";
+import { build as esbuildBuild } from "esbuild";
+
 import process from "process";
 import { basename } from "path";
 
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore; Type definitions are not found. This occurs when `strict: true` in tsconfig.json
+import readcontrol from "readcontrol";
+
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore; Type definitions are not found. This occurs when `strict: true` in tsconfig.json
+import babelPlugin from "esbuild-plugin-babel";
+
 const outDir = "./inst/www/shared/";
 
 type ShinyDesc = { version: string; package: string; license: string };
@@ -42,7 +52,7 @@ async function build(
     }
   }
 
-  const onRebuild = function (error?: string) {
+  const onRebuild = function (error: BuildFailure | null) {
     if (error) {
       console.error(printNames.join(", "), "watch build failed:\n", error);
     } else {
@@ -54,7 +64,7 @@ async function build(
   };
 
   let incremental = false;
-  let watch: false | { onRebuild: (error, result) => void } = false;
+  let watch: WatchMode | false = false;
 
   if (process.argv.length >= 3 && process.argv[2] == "--watch") {
     incremental = true;
@@ -73,9 +83,9 @@ async function build(
     preserveSymlinks: true,
     ...opts,
   }).then((x) => {
-    onRebuild();
+    onRebuild(null);
     return x;
   });
 }
 
-export { outDir, build, shinyDesc, banner };
+export { outDir, build, shinyDesc, banner, babelPlugin };

srcts/build/_jquery.ts

@@ -0,0 +1,97 @@
+/*
+Make sure all `*.ts` files contain `"jquery"` import statements to properly scope `jquery`.
+
+Prior behavior:
+- Use a patch file to remove globally declared `$` variable
+- PR: https://github.com/rstudio/shiny/pull/3296/commits/169318382d1d00927d0148a16fde4c96a291a602
+Prior reasoning:
+  - Only allow for jQuery type definitions to exist if imported.
+  - This is problematic as it can lead to improperly scoped values of `$`
+  - Ex:
+    * If `a.ts` imports jquery, then `b.ts` can see the global definition of `$`
+      even though `b.ts` does not import jquery.
+    * If `$` is not scoped / encapsulated, then it is possible to have
+      inconsistent versions of jquery executing within the shiny bundle.
+Related:
+- Open Issue ('16): https://github.com/DefinitelyTyped/DefinitelyTyped/issues/11187
+- Closed stale PR ('19): https://github.com/DefinitelyTyped/DefinitelyTyped/pull/40295/files
+- Unsolved Issue ('14): https://github.com/DefinitelyTyped/DefinitelyTyped/issues/1564
+- Multiple `$` conflicts ('22): https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60443
+  - Bandaid PR ('22): https://github.com/DefinitelyTyped/DefinitelyTyped/pull/60444
+
+Approach within this file:
+* For every `*.ts` file:
+  * Do not use `jQuery` (use `$`!)
+  * If utilizing `$`
+  * Require `jquery` import statement
+- Advantages:
+  - Does not require a yarn patch file or separate GitHub repo containing the patched type definitions.
+- Disadvantages:
+  - Variable reassignment isn't caught `jq = $; jq(divs)`. (This should not happen, but it is possible.)
+  - Only tested when bundling is started, not on every file change.
+- PR: https://github.com/rstudio/shiny/pull/3710
+*/
+
+import fs from "fs";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore; Type definitions are not found
+import readdirRecursive from "fs-readdir-recursive";
+import { isUndefined } from "lodash";
+
+const verifyJqueryUsage = async function (filename: string): Promise<void> {
+  const contents = await fs.promises.readFile(filename, "utf8");
+  const lines = contents.toString().split("\n");
+
+  // Find if using `jQuery` in the file
+  const jqueryMatch = lines.find((line) => {
+    return line.includes("jQuery.") || line.includes("jQuery(");
+  });
+
+  if (!isUndefined(jqueryMatch)) {
+    throw (
+      `Using \`jQuery\` in file: ${filename}\n` +
+      `Match:\n${jqueryMatch}\n` +
+      "Please use `$` instead of `jQuery`\n" +
+      "See file ./srcts/build/_jquery.ts for more details"
+    );
+  }
+
+  // Find if using `$` in the file
+  const dollarMatch = lines.find((line) => {
+    return line.includes("$.") || line.includes("$(");
+  });
+
+  if (isUndefined(dollarMatch)) {
+    // No match found. Not using jquery
+    return;
+  }
+
+  // Using jquery, find that it is being imported
+  const importJquery = 'import $ from "jquery";';
+  const hasJqueryImport = lines.includes(importJquery);
+
+  if (!hasJqueryImport) {
+    // Not importing jquery, yell
+    throw (
+      `Using \`$\` in file: ${filename}\n` +
+      `Match:\n${dollarMatch}\n` +
+      `Please call \`${importJquery}\` at the top of the file.\n` +
+      "See file ./srcts/build/_jquery.ts for more details"
+    );
+  }
+
+  // Using jquery and importing it;
+  return;
+};
+
+const verifyJqueryImport = async function (dir = "."): Promise<void> {
+  const tsFiles = (readdirRecursive(dir) as string[])
+    .filter((path: string) => path.endsWith(".ts"))
+    .map((path) => dir + "/" + path);
+
+  // Run all checks in parallel
+  await Promise.all(tsFiles.map((file) => verifyJqueryUsage(file)));
+  return;
+};
+
+export { verifyJqueryImport };

srcts/build/external_libs.ts

@@ -10,6 +10,12 @@ import globalsPlugin from "esbuild-plugin-globals";
 const opts = {
   bundle: false,
   sourcemap: false,
+  // Oddly, esbuild seems to use the top-level tsconfig.json file even when just
+  // minifying JS to JS. Because that tsconfig file has "strict":true, esbuild
+  // ends up adding "use strict" to the top of each minified JS file, which can
+  // alter behavior. To avoid this, we have a separate tsconfig file with
+  // "alwaysStrict":false.
+  tsconfig: "srcts/build/external_libs_tsconfig.json",
 };
 
 readdir(outDir + "datepicker/js/locales/").then(async (localeFiles) => {

srcts/build/external_libs_tsconfig.json

@@ -0,0 +1,6 @@
+{
+    "compilerOptions": {
+      "target": "ES5",
+      "alwaysStrict": false
+    }
+}

srcts/build/extras.ts

@@ -5,8 +5,7 @@
 
 // - TypeScript -----------------------------------------------------------
 
-import { banner, build, outDir } from "./_build";
-import babelPlugin from "esbuild-plugin-babel";
+import { banner, build, outDir, babelPlugin } from "./_build";
 
 build({
   bundle: true,
@@ -25,8 +24,10 @@ build({
 // - Sass -----------------------------------------------------------
 
 import autoprefixer from "autoprefixer";
-import postCssPlugin from "@deanc/esbuild-plugin-postcss";
 import sassPlugin from "esbuild-plugin-sass";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore; Type definitions are not found. This occurs when `strict: true` in tsconfig.json
+import postCssPlugin from "@deanc/esbuild-plugin-postcss";
 
 const sassOpts = {
   minify: true,

srcts/build/shiny.ts

@@ -3,10 +3,10 @@
 // yarn build
 // ```
 
-import { banner, build, outDir, shinyDesc } from "./_build";
+import { banner, build, outDir, shinyDesc, babelPlugin } from "./_build";
 import globalsPlugin from "esbuild-plugin-globals";
-import babelPlugin from "esbuild-plugin-babel";
 import type { BuildOptions } from "esbuild";
+import { verifyJqueryImport } from "./_jquery";
 
 const opts: BuildOptions = {
   entryPoints: ["srcts/src/index.ts"],
@@ -27,12 +27,21 @@ const opts: BuildOptions = {
   banner: banner,
 };
 
-build({
-  ...opts,
-  outfile: outDir + "shiny.js",
-});
-build({
-  ...opts,
-  outfile: outDir + "shiny.min.js",
-  minify: true,
-});
+// Make sure all ts files contain jquery import statements before building
+verifyJqueryImport("srcts/src")
+  .then(() => {
+    Promise.all([
+      build({
+        ...opts,
+        outfile: outDir + "shiny.js",
+      }),
+      build({
+        ...opts,
+        outfile: outDir + "shiny.min.js",
+        minify: true,
+      }),
+    ]);
+  })
+  .catch((err) => {
+    console.error("Error:\n" + err);
+  });

srcts/patch/README.md

@@ -1,7 +1,5 @@
 # `yarn` Patch files
 
-* `types-jquery.patch`
-  * Do not export `$` as a globally available variable. When developing TS code, I like to have full control over the variables. It is good to have a record of where everything comes from. Shiny can not use the latest jQuery loaded onto the page and needs to use a scoped `jQuery` variable. In the end, we can shim the `jquery` import to be `window.jQuery`
 * `yarn_pnp.patch`
   * This file is currently not used and is outdated.
   * This provides a good game plan on how to use PnP with Yarn once esbuild can easily be integrated with Yarn PnP.

srcts/patch/types-jquery.patch

@@ -1,21 +0,0 @@
-diff --git a/misc.d.ts b/misc.d.ts
-index 126d374477db459e1a251f5af548e88b46f43cdd..948cfb287b0bfa6057f3ccbcd013579aef07a29a 100644
---- a/misc.d.ts
-+++ b/misc.d.ts
-@@ -6618,7 +6618,7 @@ $( "#checkMetaKey" ).click(function( event ) {
- }
-
- declare const jQuery: JQueryStatic;
--declare const $: JQueryStatic;
-+// declare const $: JQueryStatic;
-
- type _Event = Event;
- type _UIEvent = UIEvent;
-@@ -6643,6 +6643,6 @@ interface SymbolConstructor {
-     readonly toStringTag: symbol;
- }
-
--declare var Symbol: SymbolConstructor;
-+// declare var Symbol: SymbolConstructor;
-
- // #endregion

srcts/src/bindings/input/actionbutton.ts

@@ -1,9 +1,8 @@
 import $ from "jquery";
+import { hasDefinedProperty } from "../../utils";
 import { InputBinding } from "./inputBinding";
 
-import { hasOwnProperty } from "../../utils";
-
-type ActionButtonReceiveMessageData = { label?: string; icon?: string };
+type ActionButtonReceiveMessageData = { label?: string; icon?: string | [] };
 
 class ActionButtonInputBinding extends InputBinding {
   find(scope: HTMLElement): JQuery<HTMLElement> {
@@ -40,7 +39,7 @@ class ActionButtonInputBinding extends InputBinding {
     const $el = $(el);
 
     // retrieve current label and icon
-    let label = $el.text();
+    let label: string = $el.text();
     let icon = "";
 
     // to check (and store) the previous icon, we look for a $el child
@@ -57,16 +56,18 @@ class ActionButtonInputBinding extends InputBinding {
     }
 
     // update the requested properties
-    if (hasOwnProperty(data, "label")) label = data.label;
-    if (hasOwnProperty(data, "icon")) {
-      icon = data.icon;
-      // if the user entered icon=character(0), remove the icon
-      if (icon.length === 0) icon = "";
+    if (hasDefinedProperty(data, "label")) {
+      label = data.label;
+    }
+    if (hasDefinedProperty(data, "icon")) {
+      // `data.icon` can be an [] if user gave `character(0)`.
+      icon = Array.isArray(data.icon) ? "" : data.icon ?? "";
     }
 
     // produce new html
     $el.html(icon + " " + label);
   }
+
   unsubscribe(el: HTMLElement): void {
     $(el).off(".actionButtonInputBinding");
   }

srcts/src/bindings/input/checkbox.ts

@@ -1,6 +1,6 @@
 import $ from "jquery";
 import { InputBinding } from "./inputBinding";
-import { hasOwnProperty } from "../../utils";
+import { hasDefinedProperty } from "../../utils";
 
 type CheckedHTMLElement = HTMLInputElement;
 
@@ -35,12 +35,15 @@ class CheckboxInputBinding extends InputBinding {
     el: CheckedHTMLElement,
     data: CheckboxReceiveMessageData
   ): void {
-    if (hasOwnProperty(data, "value")) el.checked = data.value;
+    if (hasDefinedProperty(data, "value")) {
+      el.checked = data.value;
+    }
 
     // checkboxInput()'s label works different from other
     // input labels...the label container should always exist
-    if (hasOwnProperty(data, "label"))
+    if (hasDefinedProperty(data, "label")) {
       $(el).parent().find("span").text(data.label);
+    }
 
     $(el).trigger("change");
   }

srcts/src/bindings/input/checkboxgroup.ts

@@ -1,7 +1,7 @@
 import $ from "jquery";
 
 import { InputBinding } from "./inputBinding";
-import { $escape, hasOwnProperty, updateLabel } from "../../utils";
+import { $escape, updateLabel, hasDefinedProperty } from "../../utils";
 import type { CheckedHTMLElement } from "./checkbox";
 
 type CheckboxGroupHTMLElement = CheckedHTMLElement;
@@ -24,9 +24,11 @@ function getLabelNode(el: CheckboxGroupHTMLElement): JQuery<HTMLElement> {
 // Given an input DOM object, get the associated label. Handles labels
 // that wrap the input as well as labels associated with 'for' attribute.
 function getLabel(obj: HTMLElement): string | null {
+  const parentNode = obj.parentNode as HTMLElement;
+
   // If <label><input /><span>label text</span></label>
-  if ((obj.parentNode as HTMLElement).tagName === "LABEL") {
-    return $(obj.parentNode).find("span").text().trim();
+  if (parentNode.tagName === "LABEL") {
+    return $(parentNode).find("span").text().trim();
   }
 
   return null;
@@ -35,9 +37,11 @@ function getLabel(obj: HTMLElement): string | null {
 // that wrap the input as well as labels associated with 'for' attribute.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function setLabel(obj: HTMLElement, value: string): null {
+  const parentNode = obj.parentNode as HTMLElement;
+
   // If <label><input /><span>label text</span></label>
-  if ((obj.parentNode as HTMLElement).tagName === "LABEL") {
-    $(obj.parentNode).find("span").text(value);
+  if (parentNode.tagName === "LABEL") {
+    $(parentNode).find("span").text(value);
   }
 
   return null;
@@ -58,7 +62,10 @@ class CheckboxGroupInputBinding extends InputBinding {
     }
     return values;
   }
-  setValue(el: HTMLElement, value: string[] | string): void {
+  setValue(el: HTMLElement, value: string[] | string | null): void {
+    // Null value should be treated as empty array
+    value = value ?? [];
+
     // Clear all checkboxes
     $('input:checkbox[name="' + $escape(el.id) + '"]').prop("checked", false);
 
@@ -113,7 +120,7 @@ class CheckboxGroupInputBinding extends InputBinding {
     const $el = $(el);
 
     // This will replace all the options
-    if (hasOwnProperty(data, "options")) {
+    if (hasDefinedProperty(data, "options")) {
       // Clear existing options and add each new one
       $el.find("div.shiny-options-group").remove();
       // Backward compatibility: for HTML generated by shinybootstrap2 package
@@ -121,7 +128,9 @@ class CheckboxGroupInputBinding extends InputBinding {
       $el.append(data.options);
     }
 
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) {
+      this.setValue(el, data.value);
+    }
 
     updateLabel(data.label, getLabelNode(el));
 

srcts/src/bindings/input/date.ts

@@ -5,8 +5,9 @@ import {
   updateLabel,
   $escape,
   parseDate,
-  hasOwnProperty,
+  hasDefinedProperty,
 } from "../../utils";
+import type { NotUndefined } from "../../utils/extraTypes";
 
 declare global {
   interface JQuery {
@@ -14,7 +15,9 @@ declare global {
     bsDatepicker(methodName: "getUTCDate"): Date;
     // Infinity is not allowed as a literal return type. Using `1e9999` as a placeholder that resolves to Infinity
     // https://github.com/microsoft/TypeScript/issues/32277
+    // eslint-disable-next-line @typescript-eslint/no-loss-of-precision
     bsDatepicker(methodName: "getStartDate"): Date | -1e9999;
+    // eslint-disable-next-line @typescript-eslint/no-loss-of-precision
     bsDatepicker(methodName: "getEndDate"): Date | 1e9999;
     bsDatepicker(methodName: string): void;
     bsDatepicker(methodName: string, params: Date | null): void;
@@ -122,8 +125,7 @@ class DateInputBindingBase extends InputBinding {
   }
   // Given an unambiguous date string or a Date object, set the min (start) date.
   // null will unset. undefined will result in no change,
-  protected _setMin(el: HTMLElement, date: Date | null | undefined): void {
-    if (date === undefined) return;
+  protected _setMin(el: HTMLElement, date: Date | null): void {
     if (date === null) {
       $(el).bsDatepicker("setStartDate", null);
       return;
@@ -161,8 +163,7 @@ class DateInputBindingBase extends InputBinding {
   }
   // Given an unambiguous date string or a Date object, set the max (end) date
   // null will unset.
-  protected _setMax(el: HTMLElement, date: Date): void {
-    if (date === undefined) return;
+  protected _setMax(el: HTMLElement, date: Date | null): void {
     if (date === null) {
       $(el).bsDatepicker("setEndDate", null);
       return;
@@ -236,7 +237,7 @@ class DateInputBinding extends DateInputBindingBase {
     return formatDateUTC(date);
   }
   // value must be an unambiguous string like '2001-01-01', or a Date object.
-  setValue(el: HTMLElement, value: Date): void {
+  setValue(el: HTMLElement, value: Date | null): void {
     // R's NA, which is null here will remove current value
     if (value === null) {
       $(el).find("input").val("").bsDatepicker("update");
@@ -286,7 +287,7 @@ class DateInputBinding extends DateInputBindingBase {
     return {
       label: this._getLabelNode(el).text(),
       value: this.getValue(el),
-      valueString: $input.val(),
+      valueString: $input.val() as NotUndefined<ReturnType<typeof $input.val>>,
       min: min,
       max: max,
       language: $input.data("datepicker").language,
@@ -300,14 +301,14 @@ class DateInputBinding extends DateInputBindingBase {
 
     updateLabel(data.label, this._getLabelNode(el));
 
-    if (hasOwnProperty(data, "min")) this._setMin($input[0], data.min);
+    if (hasDefinedProperty(data, "min")) this._setMin($input[0], data.min);
 
-    if (hasOwnProperty(data, "max")) this._setMax($input[0], data.max);
+    if (hasDefinedProperty(data, "max")) this._setMax($input[0], data.max);
 
     // Must set value only after min and max have been set. If new value is
     // outside the bounds of the previous min/max, then the result will be a
     // blank input.
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) this.setValue(el, data.value);
 
     $(el).trigger("change");
   }

srcts/src/bindings/input/daterange.ts

@@ -3,7 +3,7 @@ import $ from "jquery";
 import {
   $escape,
   formatDateUTC,
-  hasOwnProperty,
+  hasDefinedProperty,
   updateLabel,
 } from "../../utils";
 import { DateInputBindingBase } from "./date";
@@ -114,12 +114,12 @@ class DateRangeInputBinding extends DateInputBindingBase {
 
     updateLabel(data.label, getLabelNode(el));
 
-    if (hasOwnProperty(data, "min")) {
+    if (hasDefinedProperty(data, "min")) {
       this._setMin($startinput[0], data.min);
       this._setMin($endinput[0], data.min);
     }
 
-    if (hasOwnProperty(data, "max")) {
+    if (hasDefinedProperty(data, "max")) {
       this._setMax($startinput[0], data.max);
       this._setMax($endinput[0], data.max);
     }
@@ -127,7 +127,9 @@ class DateRangeInputBinding extends DateInputBindingBase {
     // Must set value only after min and max have been set. If new value is
     // outside the bounds of the previous min/max, then the result will be a
     // blank input.
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) {
+      this.setValue(el, data.value);
+    }
 
     $el.trigger("change");
   }

srcts/src/bindings/input/fileinput.ts

@@ -24,6 +24,7 @@ function enableDraghover(el: JQuery<HTMLElement>): JQuery<HTMLElement> {
   const $el = $(el);
   let childCounter = 0;
 
+  /* eslint-disable @typescript-eslint/naming-convention */
   $el.on({
     "dragenter.draghover": (e) => {
       if (childCounter++ === 0) {
@@ -91,7 +92,7 @@ function canSetFiles(fileList: FileList): boolean {
   return true;
 }
 function handleDrop(e: JQuery.DragEventBase, el: HTMLInputElement): void {
-  const files = e.originalEvent.dataTransfer.files,
+  const files = e.originalEvent?.dataTransfer?.files,
     $el = $(el);
 
   if (files === undefined || files === null) {
@@ -109,7 +110,7 @@ function handleDrop(e: JQuery.DragEventBase, el: HTMLInputElement): void {
     // 3. The browser supports FileList and input.files assignment.
     // (Chrome, Safari)
     $el.val("");
-    el.files = e.originalEvent.dataTransfer.files;
+    el.files = files;
     // Recent versions of Firefox (57+, or "Quantum" and beyond) don't seem to
     // automatically trigger a change event, so we trigger one manually here.
     // On browsers that do trigger change, this operation appears to be
@@ -188,7 +189,7 @@ function uploadFiles(evt: JQuery.DragEvent): void {
 // TODO-barret ; Should this be an internal class property?
 let $fileInputs = $();
 
-function fileInputBindingGetId(el: HTMLInputElement): string {
+function fileInputBindingGetId(this: any, el: HTMLInputElement): string {
   return InputBinding.prototype.getId.call(this, el) || el.name;
 }
 

srcts/src/bindings/input/inputBinding.ts

@@ -2,14 +2,13 @@ import type { RatePolicyModes } from "../../inputPolicies/inputRateDecorator";
 import type { BindScope } from "../../shiny/bind";
 
 class InputBinding {
-  name: string;
+  name!: string;
 
   // Returns a jQuery object or element array that contains the
   // descendants of scope that match this binding
   find(scope: BindScope): JQuery<HTMLElement> {
     throw "Not implemented";
-    // add so that typescript isn't mad about an unused var
-    scope;
+    scope; // unused var
   }
 
   getId(el: HTMLElement): string {
@@ -18,9 +17,9 @@ class InputBinding {
 
   // Gives the input a type in case the server needs to know it
   // to deserialize the JSON correctly
-  getType(el: HTMLElement): string | false {
-    return false;
-    el;
+  getType(el: HTMLElement): string | null {
+    return null;
+    el; // unused var
   }
   getValue(el: HTMLElement): any {
     throw "Not implemented";
@@ -32,12 +31,12 @@ class InputBinding {
   // getRatePolicy. If false, send value immediately. Default behavior is `false`
   subscribe(el: HTMLElement, callback: (value: boolean) => void): void {
     // empty
-    el;
-    callback;
+    el; // unused var
+    callback; // unused var
   }
   unsubscribe(el: HTMLElement): void {
     // empty
-    el;
+    el; // unused var
   }
 
   // This is used for receiving messages that tell the input object to do
@@ -47,19 +46,19 @@ class InputBinding {
   // trigger a change event.
   receiveMessage(el: HTMLElement, data: unknown): void {
     throw "Not implemented";
-    el;
-    data;
+    el; // unused var
+    data; // unused var
   }
   getState(el: HTMLElement): unknown {
     throw "Not implemented";
-    el;
+    el; // unused var
   }
 
   getRatePolicy(
     el: HTMLElement
   ): { policy: RatePolicyModes; delay: number } | null {
     return null;
-    el;
+    el; // unused var
   }
 
   // Some input objects need initialization before being bound. This is

srcts/src/bindings/input/number.ts

@@ -1,5 +1,5 @@
 import $ from "jquery";
-import { $escape, hasOwnProperty, updateLabel } from "../../utils";
+import { $escape, hasDefinedProperty, updateLabel } from "../../utils";
 import { TextInputBindingBase } from "./text";
 
 type NumberHTMLElement = HTMLInputElement;
@@ -23,7 +23,9 @@ class NumberInputBinding extends TextInputBindingBase {
     return $(scope).find('input[type="number"]');
   }
 
-  getValue(el: NumberHTMLElement): string[] | number | string {
+  getValue(
+    el: NumberHTMLElement
+  ): string[] | number | string | null | undefined {
     const numberVal = $(el).val();
 
     if (typeof numberVal == "string") {
@@ -49,10 +51,12 @@ class NumberInputBinding extends TextInputBindingBase {
     el;
   }
   receiveMessage(el: NumberHTMLElement, data: NumberReceiveMessageData): void {
-    if (hasOwnProperty(data, "value")) el.value = data.value;
-    if (hasOwnProperty(data, "min")) el.min = data.min;
-    if (hasOwnProperty(data, "max")) el.max = data.max;
-    if (hasOwnProperty(data, "step")) el.step = data.step;
+    // Setting values to `""` will remove the attribute value from the DOM element.
+    // The attr key will still remain, but there is not value... ex: `<input id="foo" type="number" min max/>`
+    if (hasDefinedProperty(data, "value")) el.value = data.value ?? "";
+    if (hasDefinedProperty(data, "min")) el.min = data.min ?? "";
+    if (hasDefinedProperty(data, "max")) el.max = data.max ?? "";
+    if (hasDefinedProperty(data, "step")) el.step = data.step ?? "";
 
     updateLabel(data.label, getLabelNode(el));
 

srcts/src/bindings/input/radio.ts

@@ -1,6 +1,6 @@
 import $ from "jquery";
 import { InputBinding } from "./inputBinding";
-import { $escape, hasOwnProperty, updateLabel } from "../../utils";
+import { $escape, hasDefinedProperty, updateLabel } from "../../utils";
 
 type RadioHTMLElement = HTMLInputElement;
 
@@ -10,7 +10,7 @@ type ValueLabelObject = {
 };
 
 type RadioReceiveMessageData = {
-  value?: string;
+  value?: string | [];
   options?: ValueLabelObject[];
   label: string;
 };
@@ -24,9 +24,11 @@ function getLabelNode(el: RadioHTMLElement): JQuery<HTMLElement> {
 // Given an input DOM object, get the associated label. Handles labels
 // that wrap the input as well as labels associated with 'for' attribute.
 function getLabel(obj: HTMLElement): string | null {
+  const parentNode = obj.parentNode as HTMLElement;
+
   // If <label><input /><span>label text</span></label>
-  if ((obj.parentNode as HTMLElement).tagName === "LABEL") {
-    return $(obj.parentNode).find("span").text().trim();
+  if (parentNode.tagName === "LABEL") {
+    return $(parentNode).find("span").text().trim();
   }
 
   return null;
@@ -35,9 +37,11 @@ function getLabel(obj: HTMLElement): string | null {
 // that wrap the input as well as labels associated with 'for' attribute.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function setLabel(obj: HTMLElement, value: string): null {
+  const parentNode = obj.parentNode as HTMLElement;
+
   // If <label><input /><span>label text</span></label>
-  if ((obj.parentNode as HTMLElement).tagName === "LABEL") {
-    $(obj.parentNode).find("span").text(value);
+  if (parentNode.tagName === "LABEL") {
+    $(parentNode).find("span").text(value);
   }
 
   return null;
@@ -47,7 +51,9 @@ class RadioInputBinding extends InputBinding {
   find(scope: HTMLElement): JQuery<HTMLElement> {
     return $(scope).find(".shiny-input-radiogroup");
   }
-  getValue(el: RadioHTMLElement): string[] | number | string | null {
+  getValue(
+    el: RadioHTMLElement
+  ): string[] | number | string | null | undefined {
     // Select the radio objects that have name equal to the grouping div's id
     const checkedItems = $(
       'input:radio[name="' + $escape(el.id) + '"]:checked'
@@ -61,8 +67,8 @@ class RadioInputBinding extends InputBinding {
 
     return checkedItems.val();
   }
-  setValue(el: RadioHTMLElement, value: string): void {
-    if ($.isArray(value) && value.length === 0) {
+  setValue(el: RadioHTMLElement, value: string | []): void {
+    if (Array.isArray(value) && value.length === 0) {
       // Removing all checked item if the sent data is empty
       $('input:radio[name="' + $escape(el.id) + '"]').prop("checked", false);
     } else {
@@ -77,7 +83,7 @@ class RadioInputBinding extends InputBinding {
   }
   getState(el: RadioHTMLElement): {
     label: string;
-    value: string[] | number | string;
+    value: ReturnType<RadioInputBinding["getValue"]>;
     options: ValueLabelObject[];
   } {
     const $objs = $(
@@ -101,16 +107,20 @@ class RadioInputBinding extends InputBinding {
     const $el = $(el);
     // This will replace all the options
 
-    if (hasOwnProperty(data, "options")) {
+    if (hasDefinedProperty(data, "options")) {
       // Clear existing options and add each new one
       $el.find("div.shiny-options-group").remove();
       // Backward compatibility: for HTML generated by shinybootstrap2 package
       $el.find("label.radio").remove();
       // @ts-expect-error; TODO-barret; IDK what this line is doing
+      // TODO-barret; Should this line be setting attributes instead?
+      // `data.options` is an array of `{value, label}` objects
       $el.append(data.options);
     }
 
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) {
+      this.setValue(el, data.value);
+    }
 
     updateLabel(data.label, getLabelNode(el));
 

srcts/src/bindings/input/selectInput.ts

@@ -1,7 +1,8 @@
 import $ from "jquery";
 import { InputBinding } from "./inputBinding";
-import { $escape, hasOwnProperty, updateLabel } from "../../utils";
+import { $escape, hasDefinedProperty, updateLabel } from "../../utils";
 import { indirectEval } from "../../utils/eval";
+import type { NotUndefined } from "../../utils/extraTypes";
 
 type SelectHTMLElement = HTMLSelectElement & { nonempty: boolean };
 
@@ -13,8 +14,9 @@ type SelectInputReceiveMessageData = {
   value?: string;
 };
 
+type SelectizeOptions = Selectize.IOptions<string, unknown>;
 type SelectizeInfo = Selectize.IApi<string, unknown> & {
-  settings: Selectize.IOptions<string, unknown>;
+  settings: SelectizeOptions;
 };
 
 function getLabelNode(el: SelectHTMLElement): JQuery<HTMLElement> {
@@ -42,7 +44,7 @@ class SelectInputBinding extends InputBinding {
   find(scope: HTMLElement): JQuery<HTMLElement> {
     return $(scope).find("select");
   }
-  getType(el: HTMLElement): string {
+  getType(el: HTMLElement): string | null {
     const $el = $(el);
 
     if (!$el.hasClass("symbol")) {
@@ -58,8 +60,10 @@ class SelectInputBinding extends InputBinding {
   getId(el: SelectHTMLElement): string {
     return InputBinding.prototype.getId.call(this, el) || el.name;
   }
-  getValue(el: HTMLElement): string[] | number | string {
-    return $(el).val();
+  getValue(
+    el: HTMLElement
+  ): NotUndefined<ReturnType<JQuery<HTMLElement>["val"]>> {
+    return $(el).val() as NotUndefined<ReturnType<JQuery<HTMLElement>["val"]>>;
   }
   setValue(el: SelectHTMLElement, value: string): void {
     if (!isSelectize(el)) {
@@ -67,14 +71,12 @@ class SelectInputBinding extends InputBinding {
     } else {
       const selectize = this._selectize(el);
 
-      if (selectize) {
-        selectize.setValue(value);
-      }
+      selectize?.setValue(value);
     }
   }
   getState(el: SelectHTMLElement): {
     label: JQuery<HTMLElement>;
-    value: string[] | number | string;
+    value: ReturnType<SelectInputBinding["getValue"]>;
     options: Array<{ value: string; label: string }>;
   } {
     // Store options in an array of objects, each with with value and label
@@ -101,21 +103,21 @@ class SelectInputBinding extends InputBinding {
     data: SelectInputReceiveMessageData
   ): void {
     const $el = $(el);
-    let selectize;
 
     // This will replace all the options
-    if (hasOwnProperty(data, "options")) {
-      selectize = this._selectize(el);
+    if (hasDefinedProperty(data, "options")) {
+      const selectize = this._selectize(el);
+
       // Must destroy selectize before appending new options, otherwise
       // selectize will restore the original select
-      if (selectize) selectize.destroy();
+      selectize?.destroy();
       // Clear existing options and add each new one
       $el.empty().append(data.options);
       this._selectize(el);
     }
 
     // re-initialize selectize
-    if (hasOwnProperty(data, "config")) {
+    if (hasDefinedProperty(data, "config")) {
       $el
         .parent()
         .find('script[data-for="' + $escape(el.id) + '"]')
@@ -124,12 +126,22 @@ class SelectInputBinding extends InputBinding {
     }
 
     // use server-side processing for selectize
-    if (hasOwnProperty(data, "url")) {
-      selectize = this._selectize(el);
+    if (hasDefinedProperty(data, "url")) {
+      type CallbackFn = Parameters<
+        NonNullable<SelectizeInfo["settings"]["load"]>
+      >[1];
+      const selectize = this._selectize(el) as ReturnType<
+        SelectInputBinding["_selectize"]
+      > & {
+        settings: {
+          load: (query: string, callback: CallbackFn) => any;
+        };
+      };
+
       selectize.clearOptions();
       let loaded = false;
 
-      selectize.settings.load = function (query, callback) {
+      selectize.settings.load = function (query: string, callback: CallbackFn) {
         const settings = selectize.settings;
 
         $.ajax({
@@ -155,7 +167,7 @@ class SelectInputBinding extends InputBinding {
               // the group's label and value. We use the current settings of
               // the selectize object to decide the fieldnames of that obj.
               const optgroupId = elem[settings.optgroupField || "optgroup"];
-              const optgroup = {};
+              const optgroup: { [key: string]: string } = {};
 
               optgroup[settings.optgroupLabelField || "label"] = optgroupId;
               optgroup[settings.optgroupValueField || "value"] = optgroupId;
@@ -163,8 +175,8 @@ class SelectInputBinding extends InputBinding {
             });
             callback(res);
             if (!loaded) {
-              if (hasOwnProperty(data, "value")) {
-                selectize.setValue(data.value);
+              if (hasDefinedProperty(data, "value")) {
+                selectize.setValue(data.value as any);
               } else if (settings.maxItems === 1) {
                 // first item selected by default only for single-select
                 selectize.setValue(res[0].value);
@@ -178,7 +190,7 @@ class SelectInputBinding extends InputBinding {
       selectize.load(function (callback) {
         selectize.settings.load.apply(selectize, ["", callback]);
       });
-    } else if (hasOwnProperty(data, "value")) {
+    } else if (hasDefinedProperty(data, "value")) {
       this.setValue(el, data.value);
     }
 
@@ -207,7 +219,12 @@ class SelectInputBinding extends InputBinding {
   initialize(el: SelectHTMLElement): void {
     this._selectize(el);
   }
-  protected _selectize(el: SelectHTMLElement, update = false): SelectizeInfo {
+  protected _selectize(
+    el: SelectHTMLElement,
+    update = false
+  ): SelectizeInfo | undefined {
+    // Apps like 008-html do not have the selectize js library
+    // Safe-guard against missing the selectize js library
     if (!$.fn.selectize) return undefined;
     const $el = $(el);
     const config = $el
@@ -216,13 +233,13 @@ class SelectInputBinding extends InputBinding {
 
     if (config.length === 0) return undefined;
 
-    let options: {
+    let options: SelectizeOptions & {
       labelField: "label";
       valueField: "value";
       searchField: ["label"];
       onItemRemove?: (value: string) => void;
       onDropdownClose?: () => void;
-    } & { [key: string]: unknown } = $.extend(
+    } = $.extend(
       {
         labelField: "label",
         valueField: "value",
@@ -235,7 +252,7 @@ class SelectInputBinding extends InputBinding {
     if (typeof config.data("nonempty") !== "undefined") {
       el.nonempty = true;
       options = $.extend(options, {
-        onItemRemove: function (value) {
+        onItemRemove: function (this: SelectizeInfo, value: string) {
           if (this.getValue() === "")
             $("select#" + $escape(el.id))
               .empty()
@@ -249,9 +266,10 @@ class SelectInputBinding extends InputBinding {
         },
         onDropdownClose:
           // $dropdown: any
-          function () {
-            if (this.getValue() === "")
-              this.setValue($("select#" + $escape(el.id)).val());
+          function (this: SelectizeInfo) {
+            if (this.getValue() === "") {
+              this.setValue($("select#" + $escape(el.id)).val() as string);
+            }
           },
       });
     } else {
@@ -259,8 +277,9 @@ class SelectInputBinding extends InputBinding {
     }
     // options that should be eval()ed
     if (config.data("eval") instanceof Array)
-      $.each(config.data("eval"), function (i, x) {
+      $.each(config.data("eval"), function (i, x: string) {
         /*jshint evil: true*/
+        // @ts-expect-error; Need to type `options` keys to know exactly which values are accessed.
         options[x] = indirectEval("(" + options[x] + ")");
       });
     let control = $el.selectize(options)[0].selectize as SelectizeInfo;

srcts/src/bindings/input/slider.ts

@@ -1,10 +1,14 @@
+import type {
+  IonRangeSliderEvent,
+  IonRangeSliderOptions,
+} from "ion-rangeslider";
 import $ from "jquery";
 // import { NameValueHTMLElement } from ".";
 import {
   formatDateUTC,
   updateLabel,
   $escape,
-  hasOwnProperty,
+  hasDefinedProperty,
 } from "../../utils";
 
 import type { TextHTMLElement } from "./text";
@@ -28,6 +32,11 @@ type SliderReceiveMessageData = {
   min?: number;
   max?: number;
   step?: number;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  "data-type"?: string;
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  "time-format"?: string;
+  timezone?: string;
 };
 
 // MUST use window.strftime as the javascript dependency is dynamic
@@ -42,7 +51,7 @@ declare global {
 }
 
 // Necessary to get hidden sliders to send their updated values
-function forceIonSliderUpdate(slider) {
+function forceIonSliderUpdate(slider: any) {
   if (slider.$cache && slider.$cache.input)
     slider.$cache.input.trigger("change");
   else console.log("Couldn't force ion slider to update");
@@ -73,7 +82,7 @@ function getTypePrettifyer(
     // The default prettify function for ion.rangeSlider adds thousands
     // separators after the decimal mark, so we have our own version here.
     // (#1958)
-    prettify = function (num) {
+    prettify = function (this: IonRangeSliderOptions, num: number) {
       // When executed, `this` will refer to the `IonRangeSlider.options`
       // object.
       return formatNumber(num, this.prettify_separator);
@@ -104,18 +113,18 @@ class SliderInputBinding extends TextInputBindingBase {
     return $(scope).find("input.js-range-slider");
   }
 
-  getType(el: HTMLElement): string | false {
+  getType(el: HTMLElement): string | null {
     const dataType = $(el).data("data-type");
 
     if (dataType === "date") return "shiny.date";
     else if (dataType === "datetime") return "shiny.datetime";
-    else return false;
+    else return null;
   }
   getValue(
     el: TextHTMLElement
   ): number | string | [number | string, number | string] {
     const $el = $(el);
-    const result = $(el).data("ionRangeSlider").result;
+    const result = $(el).data("ionRangeSlider").result as IonRangeSliderEvent;
 
     // Function for converting numeric value from slider to appropriate type.
     let convert: (val: unknown) => number | string;
@@ -182,21 +191,28 @@ class SliderInputBinding extends TextInputBindingBase {
       prettify?: Prettify;
     } = {};
 
-    if (hasOwnProperty(data, "value")) {
+    if (hasDefinedProperty(data, "value")) {
       if (numValues(el) === 2 && data.value instanceof Array) {
         msg.from = data.value[0];
         msg.to = data.value[1];
       } else {
-        msg.from = data.value as number | string;
+        if (Array.isArray(data.value)) {
+          throw "Slider only contains a single value and cannot be updated with an array";
+        }
+        msg.from = data.value;
       }
     }
 
-    const sliderFeatures = ["min", "max", "step"];
+    const sliderFeatures: Array<"max" | "min" | "step"> = [
+      "min",
+      "max",
+      "step",
+    ];
 
     for (let i = 0; i < sliderFeatures.length; i++) {
       const feats = sliderFeatures[i];
 
-      if (hasOwnProperty(data, feats)) {
+      if (hasDefinedProperty(data, feats)) {
         msg[feats] = data[feats];
       }
     }
@@ -204,12 +220,16 @@ class SliderInputBinding extends TextInputBindingBase {
     updateLabel(data.label, getLabelNode(el));
 
     // (maybe) update data elements
-    const domElements = ["data-type", "time-format", "timezone"];
+    const domElements: Array<"data-type" | "time-format" | "timezone"> = [
+      "data-type",
+      "time-format",
+      "timezone",
+    ];
 
     for (let i = 0; i < domElements.length; i++) {
       const elem = domElements[i];
 
-      if (hasOwnProperty(data, elem)) {
+      if (hasDefinedProperty(data, elem)) {
         $el.data(elem, data[elem]);
       }
     }
@@ -284,12 +304,12 @@ function formatNumber(
 $(document).on("click", ".slider-animate-button", function (evt: Event) {
   evt.preventDefault();
   const self = $(this);
-  const target = $("#" + $escape(self.attr("data-target-id")));
+  const target = $("#" + $escape(self.attr("data-target-id") as string));
   const startLabel = "Play";
   const stopLabel = "Pause";
   const loop =
     self.attr("data-loop") !== undefined &&
-    !/^\s*false\s*$/i.test(self.attr("data-loop"));
+    !/^\s*false\s*$/i.test(self.attr("data-loop") as string);
   let animInterval = self.attr("data-interval") as number | string;
 
   if (isNaN(animInterval as number)) animInterval = 1500;

srcts/src/bindings/input/tabinput.ts

@@ -1,6 +1,6 @@
 import $ from "jquery";
 import { InputBinding } from "./inputBinding";
-import { hasOwnProperty, isBS3 } from "../../utils";
+import { hasDefinedProperty, isBS3 } from "../../utils";
 
 type TabInputReceiveMessageData = { value?: string };
 
@@ -25,7 +25,7 @@ class BootstrapTabInputBinding extends InputBinding {
 
     return null;
   }
-  setValue(el: HTMLElement, value: string): void {
+  setValue(el: HTMLElement, value: string | undefined): void {
     let success = false;
 
     if (value) {
@@ -56,7 +56,7 @@ class BootstrapTabInputBinding extends InputBinding {
     return { value: this.getValue(el) };
   }
   receiveMessage(el: HTMLElement, data: TabInputReceiveMessageData): void {
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) this.setValue(el, data.value);
     $(el).trigger("change");
   }
   subscribe(el: HTMLElement, callback: (x: boolean) => void): void {

srcts/src/bindings/input/text.ts

@@ -1,5 +1,5 @@
 import $ from "jquery";
-import { $escape, updateLabel, hasOwnProperty } from "../../utils";
+import { $escape, updateLabel, hasDefinedProperty } from "../../utils";
 
 import { InputBinding } from "./inputBinding";
 
@@ -109,11 +109,12 @@ class TextInputBinding extends TextInputBindingBase {
     };
   }
   receiveMessage(el: TextHTMLElement, data: TextReceiveMessageData): void {
-    if (hasOwnProperty(data, "value")) this.setValue(el, data.value);
+    if (hasDefinedProperty(data, "value")) this.setValue(el, data.value);
 
     updateLabel(data.label, getLabelNode(el));
 
-    if (hasOwnProperty(data, "placeholder")) el.placeholder = data.placeholder;
+    if (hasDefinedProperty(data, "placeholder"))
+      el.placeholder = data.placeholder;
 
     $(el).trigger("change");
   }