v0.6.2 (#438)

.Rbuildignore

@@ -12,3 +12,5 @@ README.R?md
 revdep
 ^pkgdown/*
 ^_pkgdown\.yml$
+^cran-comments\.md$
+^CRAN-SUBMISSION$

.github/CODE_OF_CONDUCT.md

@@ -59,7 +59,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com. All complaints will be reviewed and investigated promptly and fairly.
+reported to the community leaders responsible for enforcement at codeofconduct@posit.co. All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
 reporter of any incident.

.gitignore

@@ -6,3 +6,5 @@
 .*.Rnb.cached
 sandbox/
 reference
+CRAN-SUBMISSION
+

DESCRIPTION

@@ -1,86 +1,76 @@
-Package: flexdashboard
 Type: Package
+Package: flexdashboard
 Title: R Markdown Format for Flexible Dashboards
-Version: 0.6.1.9000
-Description: Format for converting an R Markdown document to a grid oriented
-  dashboard. The dashboard flexibly adapts the size of it's components to the
-  containing web page.
+Version: 0.6.2
 Authors@R: c(
-  person("Garrick", "Aden-Buie", role = c("aut", "cre"),
-    email = "[email protected]", comment = c(ORCID = "0000-0002-7111-0077")),
-  person("Carson", "Sievert", role = "aut",
-    email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
-  person("Richard", "Iannone", role = "aut", email = "[email protected]",
-         comment = c(ORCID = "0000-0003-3925-190X")),
-  person("JJ", "Allaire", role = "aut", email = "[email protected]"),
-  person("Barbara", "Borges", role = c("aut"), email = "[email protected]"),
-  person(family = "RStudio", role = "cph"),
-  person(family = "Keen IO", role = c("ctb", "cph"), comment = "Dashboard CSS"),
-  person("Abdullah", "Almsaeed", role = c("ctb", "cph"), comment = "Dashboard CSS"),
-  person("Jonas", "Mosbech", role = c("ctb", "cph"), comment = "StickyTableHeaders"),
-  person("Noel", "Bossart", role = c("ctb", "cph"), comment = "Featherlight"),
-  person("Lea", "Verou", role = c("ctb", "cph"), comment = "Prism"),
-  person("Dmitry", "Baranovskiy", role = c("ctb", "cph"), comment = "Raphael.js"),
-  person(family = "Sencha Labs", role = c("ctb", "cph"), comment = "Raphael.js"),
-  person("Bojan", "Djuricic", role = c("ctb", "cph"), comment = "JustGage"),
-  person("Tomas", "Sardyha", role = c("ctb", "cph"), comment = "Sly"),
-  person("Bryan", "Lewis", role = c("ctb", "cph"), comment = "Examples"),
-  person("Joshua", "Kunst", role = c("ctb", "cph"), comment = "Examples"),
-  person("Ryan", "Hafen", role = c("ctb", "cph"), comment = "Examples"),
-  person("Bob", "Rudis", role = c("ctb", "cph"), comment = "Examples"),
-  person("Joe", "Cheng", role = c("ctb"), comment = "Examples")
+    person("Garrick", "Aden-Buie", , "[email protected]", role = c("aut", "cre"),
+           comment = c(ORCID = "0000-0002-7111-0077")),
+    person("Carson", "Sievert", , "[email protected]", role = "aut",
+           comment = c(ORCID = "0000-0002-4958-2844")),
+    person("Richard", "Iannone", , "[email protected]", role = "aut",
+           comment = c(ORCID = "0000-0003-3925-190X")),
+    person("JJ", "Allaire", , "[email protected]", role = "aut"),
+    person("Barbara", "Borges", , "[email protected]", role = "aut"),
+    person("Posit Software, PBC", role = c("cph", "fnd")),
+    person(, "Keen IO", role = c("ctb", "cph"),
+           comment = "Dashboard CSS"),
+    person("Abdullah", "Almsaeed", role = c("ctb", "cph"),
+           comment = "Dashboard CSS"),
+    person("Jonas", "Mosbech", role = c("ctb", "cph"),
+           comment = "StickyTableHeaders"),
+    person("Noel", "Bossart", role = c("ctb", "cph"),
+           comment = "Featherlight"),
+    person("Lea", "Verou", role = c("ctb", "cph"),
+           comment = "Prism"),
+    person("Dmitry", "Baranovskiy", role = c("ctb", "cph"),
+           comment = "Raphael.js"),
+    person(, "Sencha Labs", role = c("ctb", "cph"),
+           comment = "Raphael.js"),
+    person("Bojan", "Djuricic", role = c("ctb", "cph"),
+           comment = "JustGage"),
+    person("Tomas", "Sardyha", role = c("ctb", "cph"),
+           comment = "Sly"),
+    person("Bryan", "Lewis", role = c("ctb", "cph"),
+           comment = "Examples"),
+    person("Joshua", "Kunst", role = c("ctb", "cph"),
+           comment = "Examples"),
+    person("Ryan", "Hafen", role = c("ctb", "cph"),
+           comment = "Examples"),
+    person("Bob", "Rudis", role = c("ctb", "cph"),
+           comment = "Examples"),
+    person("Joe", "Cheng", role = "ctb",
+           comment = "Examples")
   )
-URL: https://pkgs.rstudio.com/flexdashboard/, https://github.com/rstudio/flexdashboard/
+Description: Format for converting an R Markdown document to a grid
+    oriented dashboard. The dashboard flexibly adapts the size of it's
+    components to the containing web page.
+License: MIT + file LICENSE
+URL: https://pkgs.rstudio.com/flexdashboard/,
+    https://github.com/rstudio/flexdashboard/
 BugReports: https://github.com/rstudio/flexdashboard/issues
-Encoding: UTF-8
-Depends: R (>= 3.0.2)
+Depends:
+    R (>= 3.0.2)
 Imports:
-  grDevices,
-  tools,
-  utils,
-  jsonlite,
-  htmltools (>= 0.5.1),
-  knitr (>= 1.30),
-  htmlwidgets (>= 0.6),
-  rmarkdown (>= 2.8),
-  shiny (>= 0.13),
-  scales,
-  sass,
-  bslib (>= 0.2.5)
-Suggests: testthat
-LazyData: TRUE
-License: MIT + file LICENSE
-RoxygenNote: 7.2.3
-Config/testthat/edition: 3
-Config/Needs/website:
-    rstudio/quillt
-Config/Needs/deploy:
-    dplyr,
-    ggplot2,
-    DT,
-    talgalili/d3heatmap,
-    plotly,
-    plyr,
-    biclust,
-    webshot,
-    bit,
-    jcheng5/bubbles,
-    digest,
-    hadley/shinySignals,
-    dygraphs,
-    quantmod,
-    forecast,
-    highcharter,
-    arules,
-    treemap,
-    viridisLite,
-    leaflet,
-    metricsgraphics,
-    rbokeh,
-    readr,
-    tidyr,
+    bslib (>= 0.2.5),
+    grDevices,
+    htmltools (>= 0.5.1),
+    htmlwidgets (>= 0.6),
     jsonlite,
-    maptools,
-    purrr,
-    maps,
-    hexbin
+    knitr (>= 1.30),
+    rmarkdown (>= 2.8),
+    sass,
+    scales,
+    shiny (>= 0.13),
+    tools,
+    utils
+Suggests:
+    testthat
+Config/Needs/deploy: dplyr, ggplot2, DT, talgalili/d3heatmap, plotly,
+    plyr, biclust, webshot, bit, jcheng5/bubbles, digest,
+    hadley/shinySignals, dygraphs, quantmod, forecast, highcharter,
+    arules, treemap, viridisLite, leaflet, metricsgraphics, rbokeh, readr,
+    tidyr, jsonlite, maptools, purrr, maps, hexbin
+Config/Needs/website: rstudio/quillt
+Config/testthat/edition: 3
+Encoding: UTF-8
+RoxygenNote: 7.2.3

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2008-2016
-COPYRIGHT HOLDER: RStudio; Keen IO; Abdullah Almsaeed; Jonas Mosbech; Noel Bossart; Lea Verou; Dmitry Baranovskiy; Sencha Labs; Bojan Djuricic; Bryan Lewis; Carson Sievert; Joshua Kunst; Ryan Hafen; Bob Rudis
+YEAR: 2008-2023
+COPYRIGHT HOLDER: Posit Software, PBC; flexdashboard authors; Keen IO; Abdullah Almsaeed; Jonas Mosbech; Noel Bossart; Lea Verou; Dmitry Baranovskiy; Sencha Labs; Bojan Djuricic; Bryan Lewis; Carson Sievert; Joshua Kunst; Ryan Hafen; Bob Rudis

NEWS.md

@@ -1,10 +1,14 @@
-# flexdashboard 0.6.1.9000
+# flexdashboard 0.6.2
 
-* Fixed #411: Improved support for Bootstrap 5 to ensure correct handling of the active dashboard page. (#418)
+## New features
+
+* flexdashboard now supports icons for navigation dropdown menus. Pages are created with level-1 headings and can be added to a dropdown menu with the `data-navmenu` attribute. You can now also assign an icon to this dropdown menu by providing a `data-navmenu-icon` attribute, using the same icon selections as described in [Page Icons](https://pkgs.rstudio.com/flexdashboard/articles/using.html#page-icons). (#419)
 
 * Improved support for page selection in navigation dropdown menus in Bootstrap 5. (#421)
 
-* flexdashboard now supports icons for navigation dropdown menus. Pages are created with level-1 headings and can be added to a dropdown menu with the `data-navmenu` attribute. You can now also assign an icon to this dropdown menu by providing a `data-navmenu-icon` attribute, using the same icon selections as described in [Page Icons](https://pkgs.rstudio.com/flexdashboard/articles/using.html#page-icons). (#419)
+## Minor improvements and fixes
+
+* Fixed #411: Improved support for Bootstrap 5 to ensure correct handling of the active dashboard page. (#418)
 
 * Fixed #234: Use the correct social sharing link for Facebook.
 
@@ -21,13 +25,13 @@ This release adds integration with the new [`{bslib}` package](https://rstudio.g
 ### Possibly breaking changes
 
 * The `smart` argument was removed from `flexdashboard::flex_dashboard` since it was removed in rmarkdown 2.2 (relatedly, we now require rmarkdown 2.2 or higher). (#301)
-* The `window.FlexDashboard.themeColor` JavaScript object property is no longer available. Resolving of theming accent colors should now be done server-side via `{bslib}`'s [dynamic theming tools](https://rstudio.github.io/bslib/articles/custom-components.html). (#305) 
+* The `window.FlexDashboard.themeColor` JavaScript object property is no longer available. Resolving of theming accent colors should now be done server-side via `{bslib}`'s [dynamic theming tools](https://rstudio.github.io/bslib/articles/custom-components.html). (#305)
 
 ### Improvements & fixes
 
-* Close #343: Fix an issue with order of dependencies with `shiny_prerendered` following previous changes in rmarkdown - rstudio/rmarkdown#2064. (#344)  
+* Close #343: Fix an issue with order of dependencies with `shiny_prerendered` following previous changes in rmarkdown - rstudio/rmarkdown#2064. (#344)
 
-* Closed #315, #321, and #286: `DT::datatable()` now fills its container correctly inside of `flexdashboard::flex_dashboard()`. (#322) 
+* Closed #315, #321, and #286: `DT::datatable()` now fills its container correctly inside of `flexdashboard::flex_dashboard()`. (#322)
 
 * Closed #310: An `.active` class may now be added to a particular `.tabset` tab to control which tab is shown by default. (#311)
 
@@ -37,7 +41,7 @@ This release adds integration with the new [`{bslib}` package](https://rstudio.g
 
 * Closed #300: When a custom `{bslib}` theme is provided to `flex_dashboard`, `gauge()` and `viewBox()` now generate default styles to match it. (#301, #305)
 
-* Closed #227: Fixed a bug with `source_code: embed` producing errors because code wasn't being escaped before being included in HTML. (#228, thanks @cderv) 
+* Closed #227: Fixed a bug with `source_code: embed` producing errors because code wasn't being escaped before being included in HTML. (#228, thanks @cderv)
 
 * Added padding to the top of the sidebar. (#294)
 

R/staticimports.R

@@ -30,9 +30,19 @@ get_package_version <- function(pkg) {
 
 is_installed <- function(pkg, version = NULL) {
   installed <- isNamespaceLoaded(pkg) || nzchar(system_file_cached(package = pkg))
+
   if (is.null(version)) {
     return(installed)
   }
+
+  if (!is.character(version) && !inherits(version, "numeric_version")) {
+    # Avoid https://bugs.r-project.org/show_bug.cgi?id=18548
+    alert <- if (identical(Sys.getenv("TESTTHAT"), "true")) stop else warning
+    alert("`version` must be a character string or a `package_version` or `numeric_version` object.")
+
+    version <- numeric_version(sprintf("%0.9g", version))
+  }
+
   installed && isTRUE(get_package_version(pkg) >= version)
 }
 

README.Rmd

@@ -25,15 +25,15 @@ The goal of **flexdashboard** is to make it easy to create interactive dashboard
 
 * [Storyboard](https://pkgs.rstudio.com/flexdashboard/articles/using.html#storyboards-1) layouts for presenting sequences of visualizations and related commentary.
 
-* Optionally use [Shiny](https://shiny.rstudio.com) to drive visualizations dynamically.
+* Optionally use [Shiny](https://shiny.posit.co/) to drive visualizations dynamically.
 
 * Optionally use [bslib](https://rstudio.github.io/bslib/) to easily [customize main colors, fonts, and more](https://pkgs.rstudio.com/flexdashboard/articles/theme.html).
 
 Learn more about **flexdashboard**: <https://pkgs.rstudio.com/flexdashboard>
 
 ## Examples
 
-<a href="https://beta.rstudioconnect.com/jjallaire/htmlwidgets-d3heatmap/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/htmlwidgets-d3heatmap.png" width=250 height=200 alt="example flexdashboard with d3 heatmap"></img></a>&nbsp;&nbsp;<a href="https://beta.rstudioconnect.com/jjallaire/htmlwidgets-ggplotly-geoms/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/plotly.png" width=250 height=200 alt="example flexdashboard using ggplotly"></img></a>&nbsp;&nbsp;<a href="https://jjallaire.shinyapps.io/shiny-biclust/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/shiny-biclust.png" width=250 height=200 alt="example flexdashboard using Shiny"></img></a>
+<a href="https://testing-apps.shinyapps.io/flexdashboard-d3heatmap/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/htmlwidgets-d3heatmap.png" width=250 height=200 alt="example flexdashboard with d3 heatmap"></img></a>&nbsp;&nbsp;<a href="https://testing-apps.shinyapps.io/flexdashboard-ggplotly/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/plotly.png" width=250 height=200 alt="example flexdashboard using ggplotly"></img></a>&nbsp;&nbsp;<a href="https://jjallaire.shinyapps.io/shiny-biclust/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/shiny-biclust.png" width=250 height=200 alt="example flexdashboard using Shiny"></img></a>
 
 View more examples [here](https://pkgs.rstudio.com/flexdashboard/articles/examples.html).
 

README.md

@@ -29,7 +29,7 @@ dashboards for R, using R Markdown.
   layouts for presenting sequences of visualizations and related
   commentary.
 
-- Optionally use [Shiny](https://shiny.rstudio.com) to drive
+- Optionally use [Shiny](https://shiny.posit.co/) to drive
   visualizations dynamically.
 
 - Optionally use [bslib](https://rstudio.github.io/bslib/) to easily
@@ -41,7 +41,7 @@ Learn more about **flexdashboard**:
 
 ## Examples
 
-<a href="https://beta.rstudioconnect.com/jjallaire/htmlwidgets-d3heatmap/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/htmlwidgets-d3heatmap.png" width=250 height=200 alt="example flexdashboard with d3 heatmap"></img></a>  <a href="https://beta.rstudioconnect.com/jjallaire/htmlwidgets-ggplotly-geoms/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/plotly.png" width=250 height=200 alt="example flexdashboard using ggplotly"></img></a>  <a href="https://jjallaire.shinyapps.io/shiny-biclust/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/shiny-biclust.png" width=250 height=200 alt="example flexdashboard using Shiny"></img></a>
+<a href="https://testing-apps.shinyapps.io/flexdashboard-d3heatmap/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/htmlwidgets-d3heatmap.png" width=250 height=200 alt="example flexdashboard with d3 heatmap"></img></a>  <a href="https://testing-apps.shinyapps.io/flexdashboard-ggplotly/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/plotly.png" width=250 height=200 alt="example flexdashboard using ggplotly"></img></a>  <a href="https://jjallaire.shinyapps.io/shiny-biclust/"><img src="https://pkgs.rstudio.com/flexdashboard/articles/images/shiny-biclust.png" width=250 height=200 alt="example flexdashboard using Shiny"></img></a>
 
 View more examples
 [here](https://pkgs.rstudio.com/flexdashboard/articles/examples.html).

cran-comments.md

@@ -0,0 +1,18 @@
+## R CMD check results
+
+0 errors | 0 warnings | 0 note
+
+New Maintainer: Garrick Aden-Buie <[email protected]>
+
+  New maintainer:
+    Garrick Aden-Buie <[email protected]>
+  Old maintainer(s):
+    Carson Sievert <[email protected]>
+
+## revdepcheck results
+
+We checked 14 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+
+ * We saw 0 new problems
+ * We failed to check 0 packages
+

revdep/cran.md

@@ -1,6 +1,6 @@
 ## revdepcheck results
 
-We checked 10 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+We checked 14 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 0 new problems
  * We failed to check 0 packages