shiny v1.7.5.1

rstudio · Oct 5, 2023 · dfe359c · dfe359c
1 parent 0b97ee1
commit dfe359c
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 16 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.7.5
+Version: 1.7.5.1
 Authors@R: c(
     person("Winston", "Chang", role = c("aut", "cre"), email = "[email protected]", comment = c(ORCID = "0000-0002-1576-2126")),
     person("Joe", "Cheng", role = "aut", email = "[email protected]"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# shiny 1.7.5.1
+
+## Bug fixes
+
+* On r-devel (R > 4.3.1), `isTruthy(NULL)` now returns `FALSE` (as it does with older versions of R). (#3906)
+
 # shiny 1.7.5
 
 ## Possibly breaking changes

diff --git a/R/utils.R b/R/utils.R
@@ -1240,14 +1240,12 @@ dotloop <- function(fun_, ...) {
 #' @param x An expression whose truthiness value we want to determine
 #' @export
 isTruthy <- function(x) {
+  if (is.null(x))
+    return(FALSE)
   if (inherits(x, 'try-error'))
     return(FALSE)
-
   if (!is.atomic(x))
     return(TRUE)
-
-  if (is.null(x))
-    return(FALSE)
   if (length(x) == 0)
     return(FALSE)
   if (all(is.na(x)))

diff --git a/inst/www/shared/shiny-autoreload.js b/inst/www/shared/shiny-autoreload.js
diff --git a/inst/www/shared/shiny-showcase.css b/inst/www/shared/shiny-showcase.css
diff --git a/inst/www/shared/shiny-showcase.js b/inst/www/shared/shiny-showcase.js
diff --git a/inst/www/shared/shiny-testmode.js b/inst/www/shared/shiny-testmode.js
diff --git a/inst/www/shared/shiny.js b/inst/www/shared/shiny.js
@@ -1,4 +1,4 @@
-/*! shiny 1.7.5 | (c) 2012-2023 RStudio, PBC. | License: GPL-3 | file LICENSE */
+/*! shiny 1.7.5.1 | (c) 2012-2023 RStudio, PBC. | License: GPL-3 | file LICENSE */
 "use strict";
 (function() {
   var __create = Object.create;
@@ -19196,7 +19196,7 @@
   var windowShiny2;
   function setShiny(windowShiny_) {
     windowShiny2 = windowShiny_;
-    windowShiny2.version = "1.7.5";
+    windowShiny2.version = "1.7.5.1";
     var _initInputBindings = initInputBindings(), inputBindings = _initInputBindings.inputBindings, fileInputBinding2 = _initInputBindings.fileInputBinding;
     var _initOutputBindings = initOutputBindings(), outputBindings = _initOutputBindings.outputBindings;
     setFileInputBinding(fileInputBinding2);

diff --git a/inst/www/shared/shiny.min.css b/inst/www/shared/shiny.min.css
diff --git a/inst/www/shared/shiny.min.js b/inst/www/shared/shiny.min.js
diff --git a/inst/www/shared/shiny.min.js.map b/inst/www/shared/shiny.min.js.map
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "homepage": "https://shiny.rstudio.com",
   "repository": "github:rstudio/shiny",
   "name": "@types/rstudio-shiny",
-  "version": "1.7.5",
+  "version": "1.7.5-alpha.1",
   "license": "GPL-3.0-only",
   "main": "",
   "browser": "",

diff --git a/tests/testthat/test-tabPanel.R b/tests/testthat/test-tabPanel.R
@@ -18,6 +18,9 @@ expect_snapshot2 <- function(...) {
   if (getRversion() < "3.6.0") {
     skip("Skipping snapshots on R < 3.6 because of different RNG method")
   }
+  if (packageVersion("htmltools") <= "0.5.6" && getRversion() > "4.3.1") {
+    skip("Skipping snapshots since htmltools is 'outdated'")
+  }
   expect_snapshot(...)
 }