prepare for CRAN

RinteRface · Jul 16, 2021 · d3cda0d · d3cda0d
1 parent de70afb
commit d3cda0d
Show file tree

Hide file tree

Showing 106 changed files with 583 additions and 297 deletions.
diff --git 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
@@ -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 = "[email protected]", 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
@@ -179,3 +179,4 @@ export(userPostTagItems)
 export(valueBox)
 export(valueBoxOutput)
 importFrom(jsonlite,toJSON)
+importFrom(lifecycle,deprecated)
diff --git 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
@@ -0,0 +1,6 @@
+#' bs4Dash
+#'
+#' @name bs4Dash
+#' @docType package
+#' @importFrom lifecycle deprecated
+"_PACKAGE"
diff --git a/R/deps.R b/R/deps.R
@@ -13,6 +13,8 @@ add_bs4Dash_deps <- function(tag, options) {
   ionicons_css <- "https://unpkg.com/[email protected]/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(
           "<script>var AdminLTEOptions = ", 
           jsonlite::toJSON(
@@ -69,16 +71,16 @@ add_bs4Dash_deps <- function(tag, options) {
     # bs4Dash custom js/css (must come after adminlte, bootstrap 4)
     htmltools::htmlDependency(
       name = "bs4Dash",
-      version = as.character(utils::packageVersion("bs4Dash")),
-      src = c(file = "bs4Dash-2.0.0"),
+      version = bs4Dash_version,
+      src = c(file = sprintf("bs4Dash-%s", bs4Dash_version)),
       script = if (getOption("shiny.minified", TRUE)) "bs4Dash.min.js" else "bs4Dash.js" ,
       stylesheet = bs4Dash_css,
       package = "bs4Dash"
     ),
     # fontawesome Commented since Shiny already loads it with icon...
     #htmltools::htmlDependency(
     #  name = "fontawesome",
-    #  version = as.character(utils::packageVersion("bs4Dash")),
+    #  version = bs4Dash_version,
     #  src = c(href = fontawesome_css),
     #  stylesheet = "all.css"
     #),
@@ -92,14 +94,14 @@ add_bs4Dash_deps <- function(tag, options) {
     # google fonts
     htmltools::htmlDependency(
       name = "googlefonts",
-      version = as.character(utils::packageVersion("bs4Dash")),
+      version = bs4Dash_version,
       src = c(href = google_fonts),
       stylesheet = ""
     ),
     # glyphicons
     htmltools::htmlDependency(
       name = "glyphicons",
-      version = as.character(utils::packageVersion("bs4Dash")),
+      version = bs4Dash_version,
       src = c(file = "glyphicons"),
       stylesheet = "glyphicons.min.css",
       package = "bs4Dash"

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -242,7 +242,7 @@ articles:
 
 news:
  releases:
- - text: "bs4Dash 2.0.1.9000"
+ - text: "bs4Dash 2.0.1"
  - text: "bs4Dash 2.0.0"
  - text: "bs4Dash 0.5.0"
  - text: "bs4Dash 0.4.0"

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/articles/bs4Dash.html b/docs/articles/bs4Dash.html
diff --git a/docs/articles/css-preloader.html b/docs/articles/css-preloader.html
diff --git a/docs/articles/extra-elements.html b/docs/articles/extra-elements.html
diff --git a/docs/articles/improved-boxes.html b/docs/articles/improved-boxes.html