refactor: Avoid needing to directly inspect shiny's bootstrap_deps()

shinyswatch/_get_theme_deps.py

@@ -4,9 +4,13 @@
 
 from htmltools import HTMLDependency
 
+# from shiny.ui._html_deps_external import bootstrap_deps_suppress
+from shiny._versions import bootstrap as shiny_bootstrap_version
+
 from ._assert import assert_theme
 from ._bsw5 import BSW5_THEME_NAME, bsw5_version
-from ._shiny import base_dep_version, bs5_path, bs_dep_no_files
+
+bs5_path = os.path.join(os.path.dirname(__file__), "bs5")
 
 
 def get_theme_deps(name: BSW5_THEME_NAME) -> list[HTMLDependency]:
@@ -33,22 +37,31 @@ def get_theme_deps(name: BSW5_THEME_NAME) -> list[HTMLDependency]:
         # This is to prevent the Shiny bootstrap stylesheet from being loaded and instead load the bootswatch + bootstrap stylesheet
         # _Disable_ bootstrap html dep
         # Prevents  bootstrap from being loaded at a later time (Ex: shiny.ui.card() https://github.com/rstudio/py-shiny/blob/d08af1a8534677c7026b60559cd5eafc5f6608d7/shiny/ui/_navs.py#L983)
+        #
+        # bootstrap_deps_suppress(["css", "js"]),
+        # TODO: Replace the next three lines with the above line when available
+        HTMLDependency(
+            name="bootstrap-js",
+            version=shiny_bootstrap_version + "9999",
+        ),
+        HTMLDependency(
+            name="bootstrap-css",
+            version=shiny_bootstrap_version + "9999",
+        ),
         HTMLDependency(
             name="bootstrap",
-            version=base_dep_version,
+            version=shiny_bootstrap_version + "9999",
         ),
-        # Use a custom version of bootstrap with no stylesheets/JS
-        bs_dep_no_files,
         # Add in the matching JS files
         HTMLDependency(
-            name="bootstrap-js",
+            name=f"bootstrap-{name}-js",
             version=bsw5_version,
             source={"package": "shinyswatch", "subdir": bs5_path},
             script={"src": "bootstrap.bundle.min.js"},
         ),
         # Shinyswatch - bootstrap / bootswatch css
         HTMLDependency(
-            name=f"bootswatch-{name}-and-bootstrap",
+            name=f"bootswatch-{name}-css",
             version=bsw5_version,
             source={"package": "shinyswatch", "subdir": subdir},
             stylesheet=[{"href": "bootswatch.min.css"}],
@@ -59,7 +72,7 @@ def get_theme_deps(name: BSW5_THEME_NAME) -> list[HTMLDependency]:
         # Disable ionRangeSlider
         HTMLDependency(
             name="preset-shiny-ionrangeslider",
-            version=base_dep_version,
+            version="9999",
         ),
         # Shinyswatch - ionRangeSlider css
         HTMLDependency(

shinyswatch/_theme_picker.py

@@ -1,10 +1,10 @@
-from htmltools import HTMLDependency, TagList
+from htmltools import TagList
+from packaging.version import Version
 from shiny import reactive, render, req, ui
 from shiny.session import require_active_session
 
 from ._bsw5 import BSW5_THEME_NAME, bsw5_themes
 from ._get_theme_deps import get_theme_deps
-from ._shiny import base_dep_version
 
 default_theme_name = "superhero"
 
@@ -102,12 +102,10 @@ def shinyswatch_theme_deps():  # pyright: ignore[reportUnusedFunction]
 
         # Get the theme dependencies and set them to a version that will always be registered
         theme_deps = get_theme_deps(theme_name())
-        incremented_version = HTMLDependency(
-            name="VersionOnly",
-            version=f"{base_dep_version}.{counter()}",
-        ).version
+        incremented_version = Version(f"9999.{counter()}")
         for theme_dep in theme_deps:
-            theme_dep.version = incremented_version
+            if hasattr(theme_dep, "version"):
+                theme_dep.version = incremented_version
         # Return dependencies in a TagList so they can all be utilized
         return TagList(theme_deps)