Updating the js scripts

Author: elnelson575

shiny/ui/_include_helpers.py

@@ -36,10 +36,10 @@ def include_js(
     method
         One of the following:
 
-        * ``"link"`` is the link to the CSS file via a :func:`~shiny.ui.tags.link` tag. This
+        * ``"link"`` is the link to the JS file via a :func:`~shiny.ui.tags.link` tag. This
           method is generally preferable to ``"inline"`` since it allows the browser to
           cache the file.
-        * ``"link_files"`` is the same as ``"link"``, but also allow for the CSS file to
+        * ``"link_files"`` is the same as ``"link"``, but also allow for the JS file to
           request other files within ``path``'s immediate parent directory (e.g.,
           ``@import()`` another file). Note that this isn't the default behavior because
           you should **be careful not to include files in the same directory as ``path``
@@ -48,7 +48,7 @@ def include_js(
           example, if the app's source is located at ``/app/app.py``, then ``path``
           should be somewhere like ``/app/css/custom.css`` (and all the other relevant
           accompanying 'safe' files should be located under ``/app/css/``).
-        * ``"inline"`` is the inline the CSS file contents within a
+        * ``"inline"`` is the inline the JS file contents within a
           :func:`~shiny.ui.tags.style` tag.
     **kwargs
         Attributes which are passed on to `~shiny.ui.tags.script`.
@@ -234,7 +234,6 @@ def maybe_copy_files(path: Path | str, include_files: bool) -> tuple[str, str]:
     else:
         os.makedirs(tmpdir, exist_ok=True)
         shutil.copy(path, path_dest)
-
     return path_dest, hash
 
 

tests/playwright/shiny/bugs/2061-css-js-inclusion/app.py

@@ -3,12 +3,18 @@
 from shiny import App, Inputs, Outputs, Session, ui
 
 js_file = Path(__file__).parent / "js" / "customjs.js"
+# We don't know what the temp dir will be called until we make it and that's what we need to reference
+# in the app (ex. we can't just reference where it is pre-copy)
+js2_file = (
+    ui.include_js(js_file, method="link_files").attrs["src"][:-11] + "customjs2.js"
+)
 css_file = Path(__file__).parent / "css" / "style.css"
 
 # Define the UI
 app_ui = ui.page_fluid(
     ui.include_css(css_file, method="link_files"),
     ui.include_js(js_file, method="link_files"),
+    ui.tags.script(src=str(js2_file)),
     ui.h1("Simple Shiny App with External CSS"),
     ui.div(
         ui.p("This is a simple Shiny app that demonstrates ui.include_css()"),

tests/playwright/shiny/bugs/2061-css-js-inclusion/css/more.css

@@ -1,5 +1,3 @@
-@import url("more.css");
-
 body {
   font-family: Arial, sans-serif;
 }

tests/playwright/shiny/bugs/2061-css-js-inclusion/css/style.css

@@ -0,0 +1,3 @@
+const special = document.createElement('p');
+special.textContent = 'Also here!';
+document.body.appendChild(special);

tests/playwright/shiny/bugs/2061-css-js-inclusion/js/customjs2.js

@@ -6,4 +6,5 @@
 def test_inclusion(page: Page, local_app: ShinyAppProc) -> None:
     page.goto(local_app.url)
 
-    expect(page.locator("body > p")).to_have_text("Heyo!")
+    expect(page.locator("body > p").first).to_have_text("Heyo!")
+    expect(page.locator("body > p").last).to_have_text("Also here!")