Render shiny.min.css using bs_theme() (#1191)

Author: gadenbuie

CHANGELOG.md

@@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+* Shiny now compiles the Bootstrap 5-based stylesheets for component styles imported from https://github.com/rstudio/shiny. (#1191)
+
 ### Other changes
 
 * Closed #1178: Removed run-time dependency on asgiref. (#1183)

scripts/htmlDependencies.R

@@ -1,5 +1,11 @@
 #!/usr/bin/env Rscript
 
+if (requireNamespace("cli", quietly = TRUE)) {
+  message <- function(..., .envir = parent.frame()) {
+    cli::cli_progress_step(paste0(...), .envir = .envir)
+  }
+}
+
 message("Checking for node / npm")
 if (Sys.which("npm")[["npm"]] == "") {
   stop("Please install node / npm before running script")
@@ -206,6 +212,62 @@ ignored <- lapply(woff_files, function(woff_file) {
   }
 })
 
+# ------------------------------------------------------------------------------
+message("Render shiny.min.css with bs_theme()")
+with_sass_options <- withr::with_(function(x) rlang::exec(sass::sass_options_set, !!!x))
+
+sass_opts_minify <- list(
+  output_style = "compressed",
+  source_comments = FALSE,
+  source_map_embed = FALSE
+)
+
+shiny_css_dep <- with_sass_options(
+  sass_opts_minify,
+  shiny:::shinyDependencyCSS(shiny_theme)
+)
+shiny_css_bslib <- fs::path(shiny_css_dep$src$file, shiny_css_dep$stylesheet)
+shiny_css_shared <- fs::path(www_shared, "shiny.min.css")
+writeLines(
+  c(
+    readLines(shiny_css_shared, n = 1), # keep header of original minified css
+    readLines(shiny_css_bslib)
+  ),
+  con = shiny_css_shared
+)
+
+message("Render selectize.min.js with bs_theme()")
+selectize_css_dep <- with_sass_options(
+  sass_opts_minify,
+  shiny:::selectizeDependencyFunc(shiny_theme)
+)
+selectize_css_bslib <- fs::path(
+  selectize_css_dep$src$file,
+  selectize_css_dep$stylesheet
+)
+selectize_shared <- fs::path(www_shared, "selectize", "css")
+fs::file_delete(fs::path(selectize_shared, "selectize.bootstrap3.css"))
+fs::file_copy(
+  selectize_css_bslib,
+  fs::path(selectize_shared, "selectize.min.css"),
+  overwrite = TRUE
+)
+
+message("Render datepicker.min.css with bs_theme()")
+datepicker_css_dep <- with_sass_options(
+  sass_opts_minify,
+  shiny:::datePickerCSS(shiny_theme)
+)
+datepicker_css_bslib <- fs::path(
+  datepicker_css_dep$src$file,
+  datepicker_css_dep$stylesheet
+)
+datepicker_shared <- fs::path(www_shared, "datepicker", "css")
+fs::file_copy(
+  datepicker_css_bslib,
+  fs::path(datepicker_shared, "bootstrap-datepicker3.min.css"),
+  overwrite = TRUE
+)
 
 # ------------------------------------------------------------------------------
 message("Cleanup bootstrap bundle")

shiny/ui/_html_deps_external.py

@@ -57,7 +57,6 @@ def datepicker_deps() -> HTMLDependency:
         name="bootstrap-datepicker",
         version="1.9.0",
         source={"package": "shiny", "subdir": "www/shared/datepicker/"},
-        # TODO: pre-compile the Bootstrap 5 version?
         stylesheet={"href": "css/bootstrap-datepicker3.min.css"},
         script={"src": "js/bootstrap-datepicker.min.js"},
         # Need to enable noConflict mode. See #1346.
@@ -76,8 +75,7 @@ def selectize_deps() -> HTMLDependency:
             {"src": "js/selectize.min.js"},
             {"src": "accessibility/js/selectize-plugin-a11y.min.js"},
         ],
-        # TODO: pre-compile the Bootstrap 5 version?
-        stylesheet={"href": "css/selectize.bootstrap3.css"},
+        stylesheet={"href": "css/selectize.min.css"},
     )
 
 

shiny/www/shared/bootstrap/_version.json

@@ -1,7 +1,7 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "shiny_version": "Github (rstudio/shiny@6760c318184535185e5050aefe29e658e8710ef0)",
-  "bslib_version": "Github (rstudio/bslib@13357888d018b00d8f209b84e3f627dcdc567e64)",
+  "bslib_version": "Github (rstudio/bslib@243499ae83509ce0fe66d36488b0e20e8c227e26)",
   "htmltools_version": "CRAN (R 4.3.1)",
   "bootstrap_version": "5.3.1"
 }

shiny/www/shared/bootstrap/bootstrap.min.css

@@ -1,5 +1,5 @@
 {
   "note!": "This file is auto-generated by scripts/htmlDependencies.R",
   "package": "bslib",
-  "version": "Github (rstudio/bslib@13357888d018b00d8f209b84e3f627dcdc567e64)"
+  "version": "Github (rstudio/bslib@243499ae83509ce0fe66d36488b0e20e8c227e26)"
 }