switch to prepend_body

Archmonger · Archmonger · commit 24d08e953890 · 2026-07-05T16:20:25.000-07:00
diff --git a/src/build_scripts/install_deps.py b/src/build_scripts/install_deps.py
@@ -30,7 +30,7 @@ def find_deps(data):
 
 
 def install_deps():
-    pyproject_path = Path(__file__).parent.parent / "pyproject.toml"
+    pyproject_path = Path(__file__).parent.parent.parent / "pyproject.toml"
     with open(pyproject_path, "rb") as f:
         pyproject_data = toml.load(f)
     find_deps(pyproject_data)
diff --git a/src/reactpy/executors/asgi/pyscript.py b/src/reactpy/executors/asgi/pyscript.py
@@ -17,8 +17,9 @@
     pyscript_component_html,
     pyscript_setup_html,
 )
-from reactpy.executors.utils import html_noscript_to_html, vdom_head_to_html
-from reactpy.types import Component, ReactPyConfig, RootComponentConstructor, VdomDict
+from reactpy.executors.utils import vdom_head_to_html
+from reactpy.types import ReactPyConfig, VdomDict
+from reactpy.utils import reactpy_to_string
 
 
 class ReactPyCsr(ReactPy):
@@ -32,11 +33,7 @@ def __init__(
         initial: str | VdomDict = "",
         http_headers: dict[str, str] | None = None,
         html_head: VdomDict | None = None,
-        html_noscript: str
-        | Path
-        | Component
-        | RootComponentConstructor
-        | None = "Enable JavaScript to view this site.",
+        prepend_body: VdomDict | None = ...,  # type: ignore[assignment]
         html_lang: str = "en",
         **settings: Unpack[ReactPyConfig],
     ) -> None:
@@ -64,9 +61,9 @@ def __init__(
                 commonly used to render a loading animation.
             http_headers: Additional headers to include in the HTTP response for the base HTML document.
             html_head: Additional head elements to include in the HTML response.
-            html_noscript: String, Path to an HTML file, or component rendered to HTML
-                inside a `<noscript>` tag in the HTML body.
-                If None, then noscript is not rendered.
+            prepend_body: Content rendered at the start of the ``<body>`` element.
+                A ``VdomDict`` constructed via ``html.*`` functions, or ``None`` to omit.
+                Defaults to ``html.noscript("Enable JavaScript to view this site.")``.
             html_lang: The language of the HTML document.
             settings:
                 Global ReactPy configuration settings that affect behavior and performance. Most settings
@@ -86,7 +83,10 @@ def __init__(
         self.extra_headers = http_headers or {}
         self.dispatcher_pattern = re.compile(f"^{self.dispatcher_path}?")
         self.html_head = html_head or html.head()
-        self.html_noscript = html_noscript
+        if prepend_body is not ...:
+            self.prepend_body = prepend_body
+        else:
+            self.prepend_body = html.noscript("Enable JavaScript to view this site.")
         self.html_lang = html_lang
 
     def match_dispatch_path(self, scope: AsgiWebsocketScope) -> bool:  # nocov
@@ -106,7 +106,11 @@ class ReactPyPyscriptApp(ReactPyApp):
     def render_index_html(self) -> None:
         """Process the index.html and store the results in this class."""
         head_content = vdom_head_to_html(self.parent.html_head)
-        noscript = html_noscript_to_html(self.parent.html_noscript)
+        body_content = (
+            ""
+            if self.parent.prepend_body is None
+            else reactpy_to_string(self.parent.prepend_body)
+        )
         pyscript_setup = pyscript_setup_html(
             extra_py=self.parent.extra_py,
             extra_js=self.parent.extra_js,
@@ -124,7 +128,7 @@ def render_index_html(self) -> None:
             f'<html lang="{self.parent.html_lang}">'
             f"{head_content}"
             "<body>"
-            f"{noscript}"
+            f"{body_content}"
             f"{pyscript_component}"
             "</body>"
             "</html>"
diff --git a/src/reactpy/executors/asgi/standalone.py b/src/reactpy/executors/asgi/standalone.py
@@ -7,7 +7,6 @@
 from datetime import UTC, datetime
 from email.utils import formatdate
 from logging import getLogger
-from pathlib import Path
 from typing import Literal, Unpack, cast, overload
 
 from asgi_tools import ResponseHTML
@@ -26,18 +25,16 @@
 )
 from reactpy.executors.pyscript.utils import pyscript_setup_html
 from reactpy.executors.utils import (
-    html_noscript_to_html,
     server_side_component_html,
     vdom_head_to_html,
 )
 from reactpy.types import (
-    Component,
     PyScriptOptions,
     ReactPyConfig,
     RootComponentConstructor,
     VdomDict,
 )
-from reactpy.utils import import_dotted_path, string_to_reactpy
+from reactpy.utils import import_dotted_path, reactpy_to_string, string_to_reactpy
 
 _logger = getLogger(__name__)
 
@@ -51,11 +48,7 @@ def __init__(
         *,
         http_headers: dict[str, str] | None = None,
         html_head: VdomDict | None = None,
-        html_noscript: str
-        | Path
-        | Component
-        | RootComponentConstructor
-        | None = "Enable JavaScript to view this site.",
+        prepend_body: VdomDict | None = ...,  # type: ignore[assignment]
         html_lang: str = "en",
         pyscript_setup: bool = False,
         pyscript_options: PyScriptOptions | None = None,
@@ -67,8 +60,9 @@ def __init__(
             root_component: The root component to render. This app is typically a single page application.
             http_headers: Additional headers to include in the HTTP response for the base HTML document.
             html_head: Additional head elements to include in the HTML response.
-            html_noscript: String, Path to an HTML file, or component rendered to HTML
-                inside a `<noscript>` tag in the HTML body.
+            prepend_body: Content rendered at the start of the ``<body>`` element.
+                A ``VdomDict`` constructed via ``html.*`` functions, or ``None`` to omit.
+                Defaults to ``html.noscript("Enable JavaScript to view this site.")``.
             html_lang: The language of the HTML document.
             pyscript_setup: Whether to automatically load PyScript within your HTML head.
             pyscript_options: Options to configure PyScript behavior.
@@ -79,7 +73,10 @@ def __init__(
         self.extra_headers = http_headers or {}
         self.dispatcher_pattern = re.compile(f"^{self.dispatcher_path}?")
         self.html_head = html_head or html.head()
-        self.html_noscript = html_noscript
+        if prepend_body is not ...:
+            self.prepend_body = prepend_body
+        else:
+            self.prepend_body = html.noscript("Enable JavaScript to view this site.")
         self.html_lang = html_lang
 
         if pyscript_setup:
@@ -243,13 +240,17 @@ async def __call__(
 
     def render_index_html(self) -> None:
         """Process the index.html and store the results in this class."""
-        noscript = html_noscript_to_html(self.parent.html_noscript)
+        body_content = (
+            ""
+            if self.parent.prepend_body is None
+            else reactpy_to_string(self.parent.prepend_body)
+        )
         self._index_html = (
             "<!doctype html>"
             f'<html lang="{self.parent.html_lang}">'
             f"{vdom_head_to_html(self.parent.html_head)}"
             "<body>"
-            f"{noscript}"
+            f"{body_content}"
             f"{server_side_component_html(element_id='app', class_='', component_path='')}"
             "</body>"
             "</html>"
diff --git a/src/reactpy/executors/utils.py b/src/reactpy/executors/utils.py
@@ -2,7 +2,6 @@
 
 import logging
 from collections.abc import Iterable
-from pathlib import Path
 from typing import Any
 
 from reactpy._option import Option
@@ -13,7 +12,7 @@
     REACTPY_RECONNECT_MAX_INTERVAL,
     REACTPY_RECONNECT_MAX_RETRIES,
 )
-from reactpy.types import Component, ReactPyConfig, RootComponentConstructor, VdomDict
+from reactpy.types import ReactPyConfig, VdomDict
 from reactpy.utils import import_dotted_path, reactpy_to_string
 
 logger = logging.getLogger(__name__)
@@ -47,20 +46,6 @@ def vdom_head_to_html(head: VdomDict) -> str:
     raise ValueError("Head element must be constructed with `html.head`.")
 
 
-def html_noscript_to_html(
-    html_noscript: str | Path | VdomDict | Component | RootComponentConstructor | None,
-) -> str:
-    if html_noscript is None:
-        return ""
-    if isinstance(html_noscript, Path):
-        html_noscript = html_noscript.read_text()
-    elif callable(html_noscript):
-        html_noscript = reactpy_to_string(html_noscript())
-    elif isinstance(html_noscript, dict):
-        html_noscript = reactpy_to_string(html_noscript)
-    return f"<noscript>{html_noscript}</noscript>"
-
-
 def process_settings(settings: ReactPyConfig) -> None:
     """Process the settings and return the final configuration."""
     from reactpy import config
diff --git a/tests/test_asgi/test_pyscript.py b/tests/test_asgi/test_pyscript.py
@@ -10,11 +10,12 @@
 from starlette.routing import Route
 from starlette.templating import Jinja2Templates
 
-import reactpy
+from reactpy import config as _config
 from reactpy import html
 from reactpy.executors.asgi.pyscript import ReactPyCsr
 from reactpy.testing import BackendFixture, DisplayFixture
-from reactpy.testing.common import REACTPY_TESTS_DEFAULT_TIMEOUT
+
+REACTPY_TESTS_DEFAULT_TIMEOUT = _config.REACTPY_TESTS_DEFAULT_TIMEOUT
 
 
 @pytest.fixture(scope="module")
@@ -106,77 +107,12 @@ def test_bad_file_path():
         ReactPyCsr()
 
 
-async def test_customized_noscript(tmp_path: Path):
-    noscript_file = tmp_path / "noscript.html"
-    noscript_file.write_text(
-        '<p id="noscript-message">Please enable JavaScript.</p>',
-        encoding="utf-8",
-    )
-
-    app = ReactPyCsr(
-        Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript=noscript_file,
-    )
-
-    async with BackendFixture(app) as server:
-        url = f"http://{server.host}:{server.port}"
-        response = await asyncio.to_thread(
-            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
-        )
-        assert response.status_code == 200
-        assert (
-            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
-            in response.text
-        )
-
-
-
-async def test_customized_noscript_string():
-    app = ReactPyCsr(
-        Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript='<p id="noscript-message">Please enable JavaScript.</p>',
-    )
-
-    async with BackendFixture(app) as server:
-        url = f"http://{server.host}:{server.port}"
-        response = await asyncio.to_thread(
-            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
-        )
-        assert response.status_code == 200
-        assert (
-            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
-            in response.text
-        )
-
-
-async def test_customized_noscript_from_file(tmp_path: Path):
-    noscript_file = tmp_path / "noscript.html"
-    noscript_file.write_text(
-        '<p id="noscript-message">Please enable JavaScript.</p>',
-        encoding="utf-8",
-    )
-
-    app = ReactPyCsr(
-        Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript=noscript_file,
-    )
-
-    async with BackendFixture(app) as server:
-        url = f"http://{server.host}:{server.port}"
-        response = await asyncio.to_thread(
-            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
-        )
-        assert response.status_code == 200
-        assert (
-            '<noscript><p id="noscript-message">Please enable JavaScript.</p></noscript>'
-            in response.text
-        )
-
-
-async def test_customized_noscript_from_string():
+async def test_customized_noscript_vdom():
     app = ReactPyCsr(
         Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript='<p id="noscript-message">Please enable JavaScript.</p>',
+        prepend_body=html.noscript(
+            html.p({"id": "noscript-message"}, "Please enable JavaScript.")
+        ),
     )
 
     async with BackendFixture(app) as server:
@@ -190,17 +126,6 @@ async def test_customized_noscript_from_string():
             in response.text
         )
 
-
-async def test_customized_noscript_from_component():
-    @reactpy.component
-    def noscript_message():
-        return html.p({"id": "noscript-message"}, "Please enable JavaScript.")
-
-    app = ReactPyCsr(
-        Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript=noscript_message,
-    )
-
     async with BackendFixture(app) as server:
         url = f"http://{server.host}:{server.port}"
         response = await asyncio.to_thread(
@@ -213,20 +138,7 @@ def noscript_message():
         )
 
 
-async def test_default_noscript_rendered():
-    app = ReactPyCsr(Path(__file__).parent / "pyscript_components" / "root.py")
-
-    async with BackendFixture(app) as server:
-        url = f"http://{server.host}:{server.port}"
-        response = await asyncio.to_thread(
-            request, "GET", url, timeout=REACTPY_TESTS_DEFAULT_TIMEOUT.current
-        )
-        assert response.status_code == 200
-        assert "<noscript>Enable JavaScript to view this site.</noscript>" in response.text
-
-
-
-async def test_noscript_omitted():
+async def test_prepend_body_default_is_noscript():
     app = ReactPyCsr(Path(__file__).parent / "pyscript_components" / "root.py")
 
     async with BackendFixture(app) as server:
@@ -236,15 +148,14 @@ async def test_noscript_omitted():
         )
         assert response.status_code == 200
         assert (
-            "<noscript>Enable JavaScript to view this site.</noscript>"
-            in response.text
+            "<noscript>Enable JavaScript to view this site.</noscript>" in response.text
         )
 
 
-async def test_noscript_disabled():
+async def test_prepend_body_disabled():
     app = ReactPyCsr(
         Path(__file__).parent / "pyscript_components" / "root.py",
-        html_noscript=None,
+        prepend_body=None,
     )
 
     async with BackendFixture(app) as server:
diff --git a/tests/test_asgi/test_standalone.py b/tests/test_asgi/test_standalone.py
diff --git a/tests/test_asgi/test_utils.py b/tests/test_asgi/test_utils.py
