Bump version to 1.7.1

This allows the node_modules directory to be a symlink, without causing weird
build problems.

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: shiny
 Type: Package
 Title: Web Application Framework for R
-Version: 1.7.0
+Version: 1.7.1
 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"),

NEWS.md

@@ -1,5 +1,15 @@
+shiny 1.7.1
+===========
+
+## Bug Fixes
+
+* Closed #3516: Fix regression in repeated calls to `appendTab()` when `navbarMenu()` is already present within a `tabsetPanel()`/`navbarPage()`. (#3518)
+
+* Re-arranged conditions for testthat 1.0.0 compatibility. (#3512)
+
+
 shiny 1.7.0
-================
+===========
 
 ## Full changelog
 

inst/www/shared/shiny.js

@@ -12818,8 +12818,8 @@
           }
           function getTabIndex($tabset2, tabsetId2) {
             var existingTabIds = [0];
-            $tabset2.find("a[data-toggle='tab']").each(function() {
-              var $tab = (0, import_jquery41.default)(this);
+            $tabset2.find("> li").each(function() {
+              var $tab = (0, import_jquery41.default)(this).find("> a[data-toggle='tab']");
               if ($tab.length > 0) {
                 var href = $tab.attr("href").replace(/.*(?=#[^\s]+$)/, "");
                 var _index = href.replace("#tab-" + tabsetId2 + "-", "");

srcts/build/_build.ts

@@ -70,6 +70,7 @@ async function build(
     incremental: incremental,
     watch: watch,
     target: "es5",
+    preserveSymlinks: true,
     ...opts,
   }).then((x) => {
     onRebuild();

srcts/src/shiny/shinyapp.ts

@@ -1112,8 +1112,8 @@ class ShinyApp {
           // loop through all existing tabs, find the one with highest id
           // (since this is based on a numeric counter), and increment
 
-          $tabset.find("a[data-toggle='tab']").each(function () {
-            const $tab = $(this);
+          $tabset.find("> li").each(function () {
+            const $tab = $(this).find("> a[data-toggle='tab']");
 
             if ($tab.length > 0) {
               // remove leading url if it exists. (copy of bootstrap url stripper)

tests/testthat/test-utils.R

@@ -216,28 +216,21 @@ test_that("dateYMD works", {
     c("2020-01-14", "2019-11-05")
   )
 
-  expect_identical(
-    expect_warning(dateYMD("")),
-    ""
-  )
-  expect_identical(
-    expect_warning(dateYMD(c(NA))),
-    NA
-  )
-  expect_identical(
-    expect_warning(dateYMD(c("", NA))),
-    c("", NA)
-  )
+  expect_warning(val <- dateYMD(""))
+  expect_identical(val, "")
+
+  expect_warning(val <- dateYMD(c(NA)))
+  expect_identical(val, NA)
+
+  expect_warning(val <- dateYMD(c("", NA)))
+  expect_identical(val, c("", NA))
 
   # If there are any bad values, the entire thing goes through unchanged
-  expect_identical(
-    expect_warning(dateYMD(c("2019/11/05", NA))),
-    c("2019/11/05", NA)
-  )
-  expect_identical(
-    expect_warning(dateYMD(c("2019/11/05", ""))),
-    c("2019/11/05", "")
-  )
+  expect_warning(val <- dateYMD(c("2019/11/05", NA)))
+  expect_identical(val, c("2019/11/05", NA))
+
+  expect_warning(val <- dateYMD(c("2019/11/05", "")))
+  expect_identical(val, c("2019/11/05", ""))
 })
 
 test_that("quoToFunction handles nested quosures", {