diff --git a/.Rbuildignore b/.Rbuildignore index dcbeefa2..05da44fc 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -18,5 +18,5 @@ ^srcjs$ ^.*\.icloud$ ^netlify\.toml$ -^inst/examples/vignettes-demos$ +^inst/examples/vignettes-demos/.*./rsconnect$ diff --git a/DESCRIPTION b/DESCRIPTION index b379e6ca..753648ad 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: bs4Dash Type: Package Title: A 'Bootstrap 4' Version of 'shinydashboard' -Version: 2.0.1.9000 +Version: 2.0.1 Authors@R: c( person("David", "Granjon", email = "dgranjon@ymail.com", role = c("aut", "cre")), person(family = "RinteRface", role = "cph"), @@ -50,6 +50,7 @@ Collate: 'dashboardPage.R' 'aliases.R' 'auto-color.R' + 'bs4Dash-package.r' 'bs4DashGallery.R' 'deps.R' 'grid.R' diff --git a/NAMESPACE b/NAMESPACE index 2ff00204..c2dc4bb0 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -179,3 +179,4 @@ export(userPostTagItems) export(valueBox) export(valueBoxOutput) importFrom(jsonlite,toJSON) +importFrom(lifecycle,deprecated) diff --git a/NEWS.md b/NEWS.md index 4d28fd69..89b5fad4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,8 @@ -# bs4Dash 2.0.1.9000 +# bs4Dash 2.0.1 + +## Minor changes +- Simple patch to fix wrong .Rbuildignore [rule](https://github.com/DivadNojnarg/outstanding-shiny-ui/issues/52). +- Update internal file structure. ## Bug Fix - Fix #220: Disable badgeLabel in SidebarMenuItem when collapsed. Wrong tag structure fixed. diff --git a/R/bs4Dash-package.r b/R/bs4Dash-package.r new file mode 100644 index 00000000..20b8c951 --- /dev/null +++ b/R/bs4Dash-package.r @@ -0,0 +1,6 @@ +#' bs4Dash +#' +#' @name bs4Dash +#' @docType package +#' @importFrom lifecycle deprecated +"_PACKAGE" \ No newline at end of file diff --git a/R/deps.R b/R/deps.R index ad9d8d3f..74cb0426 100644 --- a/R/deps.R +++ b/R/deps.R @@ -13,6 +13,8 @@ add_bs4Dash_deps <- function(tag, options) { ionicons_css <- "https://unpkg.com/ionicons@4.4.2/dist/css/" google_fonts <- "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700" + bs4Dash_version <- as.character(utils::packageVersion("bs4Dash")) + bs4Dash_deps <- list( # jquery UI deps for sortable elements htmltools::htmlDependency( @@ -43,8 +45,8 @@ add_bs4Dash_deps <- function(tag, options) { # additional options (this needs to be loaded before shinydashboardPlus deps) htmltools::htmlDependency( "options", - as.character(utils::packageVersion("bs4Dash")), - src = c(file = "bs4Dash-2.0.0"), + bs4Dash_version, + src = c(file = sprintf("bs4Dash-%s", bs4Dash_version)), head = paste0( "
@@ -47,7 +47,7 @@
@@ -90,7 +90,7 @@
@@ -90,7 +90,7 @@