From cbde3a9faecc0fe6138675ec3565e6446bd9eaa8 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Fri, 29 Sep 2023 13:39:40 -0500
Subject: [PATCH 01/20] Basic quarto extension functionality

---
 shiny/__init__.py                        |   2 +
 shiny/_app.py                            |  18 +-
 shiny/_main.py                           |  11 ++
 shiny/quarto/__init__.py                 |   8 +
 shiny/quarto/_ipynb.py                   | 205 +++++++++++++++++++++++
 shiny/quarto/_output.py                  |   8 +
 shiny/render/_render.py                  |  11 +-
 shiny/render/transformer/_transformer.py |   5 +
 8 files changed, 264 insertions(+), 4 deletions(-)
 create mode 100644 shiny/quarto/__init__.py
 create mode 100644 shiny/quarto/_ipynb.py
 create mode 100644 shiny/quarto/_output.py

diff --git a/shiny/__init__.py b/shiny/__init__.py
index 12c95b494..269fb3c6e 100644
--- a/shiny/__init__.py
+++ b/shiny/__init__.py
@@ -5,6 +5,7 @@
 from ._shinyenv import is_pyodide as _is_pyodide
 
 # User-facing subpackages that should be available on `from shiny import *`
+from . import quarto
 from . import reactive
 from . import render
 from .session import (
@@ -37,6 +38,7 @@
 
 __all__ = (
     # public sub-packages
+    "quarto",
     "reactive",
     "render",
     "session",
diff --git a/shiny/_app.py b/shiny/_app.py
index 4715a2a93..3ec491717 100644
--- a/shiny/_app.py
+++ b/shiny/_app.py
@@ -3,6 +3,7 @@
 import copy
 import os
 import secrets
+from pathlib import Path
 from typing import Any, Callable, Optional, cast
 
 import starlette.applications
@@ -89,7 +90,7 @@ def server(input: Inputs, output: Outputs, session: Session):
 
     def __init__(
         self,
-        ui: Tag | TagList | Callable[[Request], Tag | TagList],
+        ui: Tag | TagList | Callable[[Request], Tag | TagList] | Path,
         server: Optional[Callable[[Inputs, Outputs, Session], None]],
         *,
         static_assets: Optional["str" | "os.PathLike[str]"] = None,
@@ -146,6 +147,12 @@ def _server(inputs: Inputs, outputs: Outputs, session: Session):
                 raise TypeError("App UI cannot be a coroutine function")
             # Dynamic UI: just store the function for later
             self.ui = cast("Callable[[Request], Tag | TagList]", ui)
+        elif isinstance(ui, Path):
+            if not ui.is_absolute():
+                raise ValueError("Path to UI must be absolute")
+            with open(ui, "r") as f:
+                page_html = f.read()
+            self.ui = {"html": page_html, "dependencies": []}
         else:
             # Static UI: render the UI now and save the results
             self.ui = self._render_page(
@@ -371,8 +378,13 @@ def _render_page(self, ui: Tag | TagList, lib_prefix: str) -> RenderedHTML:
         return rendered
 
 
-def is_uifunc(x: Tag | TagList | Callable[[Request], Tag | TagList]):
-    if isinstance(x, Tag) or isinstance(x, TagList) or not callable(x):
+def is_uifunc(x: Path | Tag | TagList | Callable[[Request], Tag | TagList]):
+    if (
+        isinstance(x, Path)
+        or isinstance(x, Tag)
+        or isinstance(x, TagList)
+        or not callable(x)
+    ):
         return False
     else:
         return True
diff --git a/shiny/_main.py b/shiny/_main.py
index f53e51392..303c3cf77 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -480,6 +480,17 @@ def static_assets(command: str) -> None:
         raise click.UsageError(f"Unknown command: {command}")
 
 
+@main.command(help="""Convert an ipynb to py file.""")
+@click.argument("file", type=str)
+def convert(file: str) -> None:
+    shiny.quarto.convert_ipynb_to_py(file)
+
+
+@main.command(help="""Get Shiny's HTML dependencies as JSON.""")
+def get_shiny_deps() -> None:
+    print(shiny.quarto.get_shiny_deps())
+
+
 class ReloadArgs(TypedDict):
     reload: NotRequired[bool]
     reload_includes: NotRequired[list[str]]
diff --git a/shiny/quarto/__init__.py b/shiny/quarto/__init__.py
new file mode 100644
index 000000000..3e1e3c518
--- /dev/null
+++ b/shiny/quarto/__init__.py
@@ -0,0 +1,8 @@
+from ._ipynb import convert_ipynb_to_py, get_shiny_deps
+from ._output import output_shim
+
+__all__ = (
+    "convert_ipynb_to_py",
+    "get_shiny_deps",
+    "output_shim",
+)
diff --git a/shiny/quarto/_ipynb.py b/shiny/quarto/_ipynb.py
new file mode 100644
index 000000000..13b60577b
--- /dev/null
+++ b/shiny/quarto/_ipynb.py
@@ -0,0 +1,205 @@
+"""Tools for parsing ipynb files."""
+from __future__ import annotations
+
+from pathlib import Path
+
+__all__ = (
+    "convert_ipynb_to_py",
+    "get_shiny_deps",
+)
+
+from typing import TYPE_CHECKING, Literal, cast
+
+from .._typing_extensions import NotRequired, TypedDict
+from ..html_dependencies import jquery_deps, shiny_deps
+
+# from htmltools import HTMLDependency
+
+
+class NbCellCodeOutputStream(TypedDict):
+    output_type: Literal["stream"]
+    name: Literal["stdout", "stderr"]
+    text: list[str]
+
+
+class NbCellCodeOutputDisplayData(TypedDict):
+    output_type: Literal["display_data"]
+    metadata: dict[str, object]
+    data: dict[str, object]
+
+
+class NbCellCodeOutputExecuteResult(TypedDict):
+    output_type: Literal["execute_result"]
+    execution_count: int
+    metadata: dict[str, object]
+    data: dict[str, object]
+
+
+NbCellCodeOutput = (
+    NbCellCodeOutputStream | NbCellCodeOutputDisplayData | NbCellCodeOutputExecuteResult
+)
+
+
+class NbCellCode(TypedDict):
+    cell_type: Literal["code"]
+    execution_count: int | None
+    id: str
+    metadata: dict[str, object]
+    source: str | list[str]
+    outputs: list[NbCellCodeOutput]
+
+
+class NbCellMarkdown(TypedDict):
+    cell_type: Literal["markdown"]
+    metadata: dict[str, object]
+    source: str | list[str]
+
+
+class NbCellRaw(TypedDict):
+    cell_type: Literal["raw"]
+    metadata: dict[str, object]
+    source: str | list[str]
+
+
+NbCell = NbCellCode | NbCellMarkdown | NbCellRaw
+
+
+class Ipynb(TypedDict):
+    cells: list[NbCell]
+    metadata: dict[str, object]
+    nbformat: int
+    nbformat_minor: int
+
+
+def convert_ipynb_to_py(file: str | Path) -> None:
+    """Parse an ipynb file."""
+    import json
+
+    file = Path(file)
+
+    with open(file, "r") as f:
+        nb = cast(Ipynb, json.load(f))
+
+    cells = nb["cells"]
+
+    code_cell_sources: list[str] = []
+
+    for cell in cells:
+        if cell["cell_type"] != "code":
+            continue
+
+        if "skip" in cell["metadata"] and cell["metadata"]["skip"] is True:
+            continue
+
+        code_cell_sources.append(
+            "    "
+            + "    ".join(cell["source"])
+            + "\n\n    # ============================\n"
+        )
+
+    app_content = f"""
+from pathlib import Path
+from shiny import App, Inputs, Outputs, Session, ui
+
+def server(input: Inputs, output: Outputs, session: Session) -> None:
+{ "".join(code_cell_sources) }
+
+app = App(
+    Path(__file__).parent / "{ file.with_suffix(".html").name }",
+    server,
+    static_assets=Path(__file__).parent,
+)
+    """
+
+    # print(app_content)
+
+    with open("app.py", "w") as f:
+        f.write(app_content)
+
+
+# =============================================================================
+# HTML Dependency types
+# =============================================================================
+class QuartoHtmlDepItem(TypedDict):
+    name: str
+    path: str
+    attribs: NotRequired[dict[str, str]]
+
+
+class QuartoHtmlDepServiceworkerItem(TypedDict):
+    source: str
+    destination: str
+
+
+class QuartoHtmlDependency(TypedDict):
+    name: str
+    version: NotRequired[str]
+    scripts: NotRequired[list[str | QuartoHtmlDepItem]]
+    stylesheets: NotRequired[list[str | QuartoHtmlDepItem]]
+    resources: NotRequired[list[QuartoHtmlDepItem]]
+    meta: NotRequired[dict[str, str]]
+    serviceworkers: NotRequired[list[QuartoHtmlDepServiceworkerItem]]
+
+
+if TYPE_CHECKING:
+    from htmltools._core import ScriptItem, StylesheetItem
+
+
+def get_shiny_deps() -> str:
+    import json
+
+    deps = [
+        jquery_deps().as_dict(lib_prefix=None, include_version=False),
+        shiny_deps().as_dict(lib_prefix=None, include_version=False),
+    ]
+
+    # Convert from htmltools format to quarto format
+    for dep in deps:
+        if "script" in dep:
+            dep["scripts"] = [htmltools_to_quarto_script(s) for s in dep.pop("script")]
+        if "stylesheet" in dep:
+            dep["stylesheets"] = [
+                htmltools_to_quarto_stylesheet(s) for s in dep.pop("stylesheet")
+            ]
+
+        del dep["meta"]
+
+    return json.dumps(deps, indent=2)
+
+
+_shared_dir = (Path(__file__) / ".." / "..").resolve() / "www" / "shared"
+
+
+def htmltools_to_quarto_script(dep: ScriptItem) -> QuartoHtmlDepItem:
+    if dep["src"].startswith("shiny"):
+        src = str(remove_first_dir(Path(dep["src"])))
+    else:
+        src = str(Path(dep["src"]))
+    # NOTE: htmltools always prepends a directory after .as_dict() is called, so we'll
+    # remove the first directory part.
+    # src = str(remove_first_dir(Path(dep["src"])))
+
+    return {
+        "name": src,
+        "path": str(_shared_dir / src),
+    }
+
+
+def htmltools_to_quarto_stylesheet(dep: StylesheetItem) -> QuartoHtmlDepItem:
+    src = str(remove_first_dir(Path(dep["href"])))
+    return {
+        "name": src,
+        "path": str(_shared_dir / src),
+    }
+
+
+def remove_first_dir(p: Path) -> Path:
+    """Remove the first directory from a Path"""
+    parts = p.parts
+
+    # If there's only one part (just a filename), return it as is
+    if len(parts) == 1:
+        return p
+
+    # Otherwise, skip the first directory and reconstruct the path
+    return Path(parts[1]).joinpath(*parts[2:])
diff --git a/shiny/quarto/_output.py b/shiny/quarto/_output.py
new file mode 100644
index 000000000..497d7cce0
--- /dev/null
+++ b/shiny/quarto/_output.py
@@ -0,0 +1,8 @@
+"""Shim for @output"""
+from __future__ import annotations
+
+__all__ = ("output_shim",)
+
+
+def output_shim(x: object) -> object:
+    return x
diff --git a/shiny/render/_render.py b/shiny/render/_render.py
index 00beb901f..6bee649c8 100644
--- a/shiny/render/_render.py
+++ b/shiny/render/_render.py
@@ -89,7 +89,16 @@ def text(
     --------
     ~shiny.ui.output_text
     """
-    return TextTransformer(_fn)
+    text_transformer_fn = TextTransformer(_fn)
+
+    def _output_ui_() -> str:
+        from .. import ui
+
+        return ui.output_text_verbatim(_fn.__name__, placeholder=True)._repr_html_()
+
+    text_transformer_fn._repr_html_ = _output_ui_
+
+    return text_transformer_fn
 
 
 # ======================================================================================
diff --git a/shiny/render/transformer/_transformer.py b/shiny/render/transformer/_transformer.py
index f206a8221..6d9bf956e 100644
--- a/shiny/render/transformer/_transformer.py
+++ b/shiny/render/transformer/_transformer.py
@@ -219,6 +219,8 @@ def __init__(
         *,
         value_fn: ValueFn[IT],
         transform_fn: TransformFn[IT, P, OT],
+        # TODO: Type should be Tag | TagChild | TagList ...
+        output_fn: Optional[Callable[[], object]] = None,
         params: TransformerParams[P],
     ) -> None:
         """
@@ -314,6 +316,8 @@ def __init__(
         value_fn: ValueFnSync[IT],
         transform_fn: TransformFn[IT, P, OT],
         params: TransformerParams[P],
+        # TODO: Type should be Tag | TagChild | TagList ...
+        output_fn: Optional[Callable[[], object]] = None,
     ) -> None:
         if is_async_callable(value_fn):
             raise TypeError(
@@ -323,6 +327,7 @@ def __init__(
         super().__init__(
             value_fn=value_fn,
             transform_fn=transform_fn,
+            output_fn=output_fn,
             params=params,
         )
 

From 7e360252ebe5a7142e026667ab862b21c677dc9e Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Tue, 3 Oct 2023 13:28:22 -0500
Subject: [PATCH 02/20] Inject HTML dependencies using placeholder

---
 shiny/_app.py | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/shiny/_app.py b/shiny/_app.py
index 3ec491717..8f5b3ec67 100644
--- a/shiny/_app.py
+++ b/shiny/_app.py
@@ -11,7 +11,14 @@
 import starlette.middleware
 import starlette.routing
 import starlette.websockets
-from htmltools import HTMLDependency, HTMLDocument, RenderedHTML, Tag, TagList
+from htmltools import (
+    HTMLDependency,
+    HTMLDocument,
+    HTMLTextDocument,
+    RenderedHTML,
+    Tag,
+    TagList,
+)
 from starlette.requests import Request
 from starlette.responses import HTMLResponse, JSONResponse, Response
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
@@ -150,9 +157,9 @@ def _server(inputs: Inputs, outputs: Outputs, session: Session):
         elif isinstance(ui, Path):
             if not ui.is_absolute():
                 raise ValueError("Path to UI must be absolute")
-            with open(ui, "r") as f:
-                page_html = f.read()
-            self.ui = {"html": page_html, "dependencies": []}
+
+            self.ui = self._render_page_from_file(ui, lib_prefix=self.lib_prefix)
+
         else:
             # Static UI: render the UI now and save the results
             self.ui = self._render_page(
@@ -377,6 +384,22 @@ def _render_page(self, ui: Tag | TagList, lib_prefix: str) -> RenderedHTML:
         self._ensure_web_dependencies(rendered["dependencies"])
         return rendered
 
+    def _render_page_from_file(self, file: Path, lib_prefix: str) -> RenderedHTML:
+        with open(file, "r") as f:
+            page_html = f.read()
+
+        doc = HTMLTextDocument(
+            page_html,
+            deps=[require_deps(), jquery_deps(), shiny_deps()],
+            deps_replace_pattern='<meta name="shiny-dependency-placeholder" content="">',
+        )
+
+        rendered = doc.render(lib_prefix=lib_prefix)
+        self._ensure_web_dependencies(rendered["dependencies"])
+
+        # TODO: scan for inlined <script> deps, inject them as well.
+        return rendered
+
 
 def is_uifunc(x: Path | Tag | TagList | Callable[[Request], Tag | TagList]):
     if (

From 4eafba62cfc166c2c0d6cf4030947f431339c33b Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Tue, 3 Oct 2023 22:26:26 -0500
Subject: [PATCH 03/20] Bump htmltools requirement

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 42408710d..43fea1214 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     starlette>=0.17.1
     websockets>=10.0
     python-multipart
-    htmltools>=0.2.1
+    htmltools>=0.3.0.9000
     click>=8.1.4
     markdown-it-py>=1.1.0
     # This is needed for markdown-it-py. Without it, when loading shiny/ui/_markdown.py,

From f941f5a0f90f20149cb6d0db147061b0d1cabe1b Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 5 Oct 2023 10:27:51 -0500
Subject: [PATCH 04/20] Use placeholder dependency

---
 shiny/quarto/_ipynb.py | 69 +++++-------------------------------------
 1 file changed, 8 insertions(+), 61 deletions(-)

diff --git a/shiny/quarto/_ipynb.py b/shiny/quarto/_ipynb.py
index 13b60577b..f4a7da382 100644
--- a/shiny/quarto/_ipynb.py
+++ b/shiny/quarto/_ipynb.py
@@ -8,12 +8,9 @@
     "get_shiny_deps",
 )
 
-from typing import TYPE_CHECKING, Literal, cast
+from typing import Literal, cast
 
 from .._typing_extensions import NotRequired, TypedDict
-from ..html_dependencies import jquery_deps, shiny_deps
-
-# from htmltools import HTMLDependency
 
 
 class NbCellCodeOutputStream(TypedDict):
@@ -141,65 +138,15 @@ class QuartoHtmlDependency(TypedDict):
     serviceworkers: NotRequired[list[QuartoHtmlDepServiceworkerItem]]
 
 
-if TYPE_CHECKING:
-    from htmltools._core import ScriptItem, StylesheetItem
-
-
-def get_shiny_deps() -> str:
-    import json
-
-    deps = [
-        jquery_deps().as_dict(lib_prefix=None, include_version=False),
-        shiny_deps().as_dict(lib_prefix=None, include_version=False),
-    ]
-
-    # Convert from htmltools format to quarto format
-    for dep in deps:
-        if "script" in dep:
-            dep["scripts"] = [htmltools_to_quarto_script(s) for s in dep.pop("script")]
-        if "stylesheet" in dep:
-            dep["stylesheets"] = [
-                htmltools_to_quarto_stylesheet(s) for s in dep.pop("stylesheet")
-            ]
-
-        del dep["meta"]
-
-    return json.dumps(deps, indent=2)
-
-
-_shared_dir = (Path(__file__) / ".." / "..").resolve() / "www" / "shared"
-
-
-def htmltools_to_quarto_script(dep: ScriptItem) -> QuartoHtmlDepItem:
-    if dep["src"].startswith("shiny"):
-        src = str(remove_first_dir(Path(dep["src"])))
-    else:
-        src = str(Path(dep["src"]))
-    # NOTE: htmltools always prepends a directory after .as_dict() is called, so we'll
-    # remove the first directory part.
-    # src = str(remove_first_dir(Path(dep["src"])))
-
-    return {
-        "name": src,
-        "path": str(_shared_dir / src),
-    }
-
-
-def htmltools_to_quarto_stylesheet(dep: StylesheetItem) -> QuartoHtmlDepItem:
-    src = str(remove_first_dir(Path(dep["href"])))
+def placeholder_dep() -> QuartoHtmlDependency:
     return {
-        "name": src,
-        "path": str(_shared_dir / src),
+        "name": "shiny-dependency-placeholder",
+        "version": "9.9.9",
+        "meta": {"shiny-dependency-placeholder": ""},
     }
 
 
-def remove_first_dir(p: Path) -> Path:
-    """Remove the first directory from a Path"""
-    parts = p.parts
-
-    # If there's only one part (just a filename), return it as is
-    if len(parts) == 1:
-        return p
+def get_shiny_deps() -> str:
+    import json
 
-    # Otherwise, skip the first directory and reconstruct the path
-    return Path(parts[1]).joinpath(*parts[2:])
+    return json.dumps([placeholder_dep()], indent=2)

From 488f8808e6e32bb5128b075d3cb3ab9fa7706348 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 5 Oct 2023 17:01:00 -0500
Subject: [PATCH 05/20] Use new cell export format

---
 shiny/_main.py           |  2 +-
 shiny/quarto/__init__.py |  4 +-
 shiny/quarto/_ipynb.py   | 82 ++++++++++------------------------------
 3 files changed, 24 insertions(+), 64 deletions(-)

diff --git a/shiny/_main.py b/shiny/_main.py
index 303c3cf77..c28048c5e 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -483,7 +483,7 @@ def static_assets(command: str) -> None:
 @main.command(help="""Convert an ipynb to py file.""")
 @click.argument("file", type=str)
 def convert(file: str) -> None:
-    shiny.quarto.convert_ipynb_to_py(file)
+    shiny.quarto.convert_code_cells_to_app_py(file)
 
 
 @main.command(help="""Get Shiny's HTML dependencies as JSON.""")
diff --git a/shiny/quarto/__init__.py b/shiny/quarto/__init__.py
index 3e1e3c518..9d21243ff 100644
--- a/shiny/quarto/__init__.py
+++ b/shiny/quarto/__init__.py
@@ -1,8 +1,8 @@
-from ._ipynb import convert_ipynb_to_py, get_shiny_deps
+from ._ipynb import convert_code_cells_to_app_py, get_shiny_deps
 from ._output import output_shim
 
 __all__ = (
-    "convert_ipynb_to_py",
+    "convert_code_cells_to_app_py",
     "get_shiny_deps",
     "output_shim",
 )
diff --git a/shiny/quarto/_ipynb.py b/shiny/quarto/_ipynb.py
index f4a7da382..4755bf2d2 100644
--- a/shiny/quarto/_ipynb.py
+++ b/shiny/quarto/_ipynb.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 
 __all__ = (
-    "convert_ipynb_to_py",
+    "convert_code_cells_to_app_py",
     "get_shiny_deps",
 )
 
@@ -12,85 +12,45 @@
 
 from .._typing_extensions import NotRequired, TypedDict
 
+QuartoShinyCodeCellClass = Literal["python", "r", "cell-code", "hidden"]
 
-class NbCellCodeOutputStream(TypedDict):
-    output_type: Literal["stream"]
-    name: Literal["stdout", "stderr"]
-    text: list[str]
 
+class QuartoShinyCodeCell(TypedDict):
+    text: str
+    classes: list[QuartoShinyCodeCellClass]
 
-class NbCellCodeOutputDisplayData(TypedDict):
-    output_type: Literal["display_data"]
-    metadata: dict[str, object]
-    data: dict[str, object]
 
+class QuartoShinyCodeCells(TypedDict):
+    schema_version: int
+    cells: list[QuartoShinyCodeCell]
 
-class NbCellCodeOutputExecuteResult(TypedDict):
-    output_type: Literal["execute_result"]
-    execution_count: int
-    metadata: dict[str, object]
-    data: dict[str, object]
 
-
-NbCellCodeOutput = (
-    NbCellCodeOutputStream | NbCellCodeOutputDisplayData | NbCellCodeOutputExecuteResult
-)
-
-
-class NbCellCode(TypedDict):
-    cell_type: Literal["code"]
-    execution_count: int | None
-    id: str
-    metadata: dict[str, object]
-    source: str | list[str]
-    outputs: list[NbCellCodeOutput]
-
-
-class NbCellMarkdown(TypedDict):
-    cell_type: Literal["markdown"]
-    metadata: dict[str, object]
-    source: str | list[str]
-
-
-class NbCellRaw(TypedDict):
-    cell_type: Literal["raw"]
-    metadata: dict[str, object]
-    source: str | list[str]
-
-
-NbCell = NbCellCode | NbCellMarkdown | NbCellRaw
-
-
-class Ipynb(TypedDict):
-    cells: list[NbCell]
-    metadata: dict[str, object]
-    nbformat: int
-    nbformat_minor: int
-
-
-def convert_ipynb_to_py(file: str | Path) -> None:
-    """Parse an ipynb file."""
+def convert_code_cells_to_app_py(file: str | Path) -> None:
+    """Parse an code cell JSON file and output an app.py file."""
     import json
 
     file = Path(file)
 
     with open(file, "r") as f:
-        nb = cast(Ipynb, json.load(f))
+        data = cast(QuartoShinyCodeCells, json.load(f))
+
+    if data["schema_version"] != 1:
+        raise ValueError("Only schema_version 1 is supported.")
 
-    cells = nb["cells"]
+    cells = data["cells"]
 
-    code_cell_sources: list[str] = []
+    code_cell_texts: list[str] = []
 
     for cell in cells:
-        if cell["cell_type"] != "code":
+        if "python" not in cell["classes"]:
             continue
 
-        if "skip" in cell["metadata"] and cell["metadata"]["skip"] is True:
+        if cell["text"].startswith("#| skip: true"):
             continue
 
-        code_cell_sources.append(
+        code_cell_texts.append(
             "    "
-            + "    ".join(cell["source"])
+            + "    ".join(cell["text"])
             + "\n\n    # ============================\n"
         )
 
@@ -99,7 +59,7 @@ def convert_ipynb_to_py(file: str | Path) -> None:
 from shiny import App, Inputs, Outputs, Session, ui
 
 def server(input: Inputs, output: Outputs, session: Session) -> None:
-{ "".join(code_cell_sources) }
+{ "".join(code_cell_texts) }
 
 app = App(
     Path(__file__).parent / "{ file.with_suffix(".html").name }",

From f6df69da3c6f3d61252db2f344598a43925133aa Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 5 Oct 2023 17:03:35 -0500
Subject: [PATCH 06/20] Move code to quarto.py

---
 shiny/__init__.py                     |  2 +-
 shiny/{quarto/_ipynb.py => quarto.py} | 11 ++++++-----
 shiny/quarto/__init__.py              |  8 --------
 shiny/quarto/_output.py               |  8 --------
 4 files changed, 7 insertions(+), 22 deletions(-)
 rename shiny/{quarto/_ipynb.py => quarto.py} (93%)
 delete mode 100644 shiny/quarto/__init__.py
 delete mode 100644 shiny/quarto/_output.py

diff --git a/shiny/__init__.py b/shiny/__init__.py
index 269fb3c6e..4e85f8fc8 100644
--- a/shiny/__init__.py
+++ b/shiny/__init__.py
@@ -1,6 +1,6 @@
 """A package for building reactive web applications."""
 
-__version__ = "0.5.1.9000"
+__version__ = "0.5.1.9001"
 
 from ._shinyenv import is_pyodide as _is_pyodide
 
diff --git a/shiny/quarto/_ipynb.py b/shiny/quarto.py
similarity index 93%
rename from shiny/quarto/_ipynb.py
rename to shiny/quarto.py
index 4755bf2d2..a1095f98f 100644
--- a/shiny/quarto/_ipynb.py
+++ b/shiny/quarto.py
@@ -3,14 +3,11 @@
 
 from pathlib import Path
 
-__all__ = (
-    "convert_code_cells_to_app_py",
-    "get_shiny_deps",
-)
+__all__ = ("convert_code_cells_to_app_py", "get_shiny_deps", "output_shim")
 
 from typing import Literal, cast
 
-from .._typing_extensions import NotRequired, TypedDict
+from ._typing_extensions import NotRequired, TypedDict
 
 QuartoShinyCodeCellClass = Literal["python", "r", "cell-code", "hidden"]
 
@@ -110,3 +107,7 @@ def get_shiny_deps() -> str:
     import json
 
     return json.dumps([placeholder_dep()], indent=2)
+
+
+def output_shim(x: object) -> object:
+    return x
diff --git a/shiny/quarto/__init__.py b/shiny/quarto/__init__.py
deleted file mode 100644
index 9d21243ff..000000000
--- a/shiny/quarto/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from ._ipynb import convert_code_cells_to_app_py, get_shiny_deps
-from ._output import output_shim
-
-__all__ = (
-    "convert_code_cells_to_app_py",
-    "get_shiny_deps",
-    "output_shim",
-)
diff --git a/shiny/quarto/_output.py b/shiny/quarto/_output.py
deleted file mode 100644
index 497d7cce0..000000000
--- a/shiny/quarto/_output.py
+++ /dev/null
@@ -1,8 +0,0 @@
-"""Shim for @output"""
-from __future__ import annotations
-
-__all__ = ("output_shim",)
-
-
-def output_shim(x: object) -> object:
-    return x

From 3e44c88f09ac3979c3c24ed25eb5e9dbe61cddf7 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 5 Oct 2023 17:04:54 -0500
Subject: [PATCH 07/20] Remove output_shim

---
 shiny/quarto.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/shiny/quarto.py b/shiny/quarto.py
index a1095f98f..18caaaedc 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -3,7 +3,7 @@
 
 from pathlib import Path
 
-__all__ = ("convert_code_cells_to_app_py", "get_shiny_deps", "output_shim")
+__all__ = ("convert_code_cells_to_app_py", "get_shiny_deps")
 
 from typing import Literal, cast
 
@@ -65,8 +65,6 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
 )
     """
 
-    # print(app_content)
-
     with open("app.py", "w") as f:
         f.write(app_content)
 
@@ -107,7 +105,3 @@ def get_shiny_deps() -> str:
     import json
 
     return json.dumps([placeholder_dep()], indent=2)
-
-
-def output_shim(x: object) -> object:
-    return x

From 50a7a73b7637932454e631a7df857da3a19ce19c Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 5 Oct 2023 17:18:43 -0500
Subject: [PATCH 08/20] Get html file name from json

---
 shiny/quarto.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/shiny/quarto.py b/shiny/quarto.py
index 18caaaedc..36ec1a649 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -20,11 +20,13 @@ class QuartoShinyCodeCell(TypedDict):
 class QuartoShinyCodeCells(TypedDict):
     schema_version: int
     cells: list[QuartoShinyCodeCell]
+    html_file: str
 
 
 def convert_code_cells_to_app_py(file: str | Path) -> None:
     """Parse an code cell JSON file and output an app.py file."""
     import json
+    from textwrap import indent
 
     file = Path(file)
 
@@ -42,13 +44,11 @@ def convert_code_cells_to_app_py(file: str | Path) -> None:
         if "python" not in cell["classes"]:
             continue
 
-        if cell["text"].startswith("#| skip: true"):
+        if "# skip" in cell["text"]:
             continue
 
         code_cell_texts.append(
-            "    "
-            + "    ".join(cell["text"])
-            + "\n\n    # ============================\n"
+            indent(cell["text"], "    ") + "\n\n    # ============================\n"
         )
 
     app_content = f"""
@@ -59,7 +59,7 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
 { "".join(code_cell_texts) }
 
 app = App(
-    Path(__file__).parent / "{ file.with_suffix(".html").name }",
+    Path(__file__).parent / "{ data["html_file"] }",
     server,
     static_assets=Path(__file__).parent,
 )

From b9142a755627bb46b26128bf7a15c4584db6b059 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Fri, 6 Oct 2023 09:09:53 -0500
Subject: [PATCH 09/20] Add app file argument

---
 shiny/_main.py  | 18 ++++++++++++++----
 shiny/quarto.py |  9 +++++----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/shiny/_main.py b/shiny/_main.py
index c28048c5e..385fab84d 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -480,10 +480,20 @@ def static_assets(command: str) -> None:
         raise click.UsageError(f"Unknown command: {command}")
 
 
-@main.command(help="""Convert an ipynb to py file.""")
-@click.argument("file", type=str)
-def convert(file: str) -> None:
-    shiny.quarto.convert_code_cells_to_app_py(file)
+@main.command(help="""Convert a JSON file with code cells to a py file.""")
+@click.argument(
+    "json_file",
+    type=str,
+)
+@click.argument(
+    "py_file",
+    type=str,
+    default=None,
+)
+def cells_to_app(json_file: str, py_file: str | None) -> None:
+    if py_file is None:
+        py_file = str(Path(json_file).parent / "app.py")
+    shiny.quarto.convert_code_cells_to_app_py(json_file, py_file)
 
 
 @main.command(help="""Get Shiny's HTML dependencies as JSON.""")
diff --git a/shiny/quarto.py b/shiny/quarto.py
index 36ec1a649..699e4b689 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -23,14 +23,15 @@ class QuartoShinyCodeCells(TypedDict):
     html_file: str
 
 
-def convert_code_cells_to_app_py(file: str | Path) -> None:
+def convert_code_cells_to_app_py(json_file: str | Path, app_file: str | Path) -> None:
     """Parse an code cell JSON file and output an app.py file."""
     import json
     from textwrap import indent
 
-    file = Path(file)
+    json_file = Path(json_file)
+    app_file = Path(app_file)
 
-    with open(file, "r") as f:
+    with open(json_file, "r") as f:
         data = cast(QuartoShinyCodeCells, json.load(f))
 
     if data["schema_version"] != 1:
@@ -65,7 +66,7 @@ def server(input: Inputs, output: Outputs, session: Session) -> None:
 )
     """
 
-    with open("app.py", "w") as f:
+    with open(app_file, "w") as f:
         f.write(app_content)
 
 

From 0a53476414191871534f340be56b61c381940991 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 9 Oct 2023 16:46:54 -0500
Subject: [PATCH 10/20] Specify reload_excludes

---
 shiny/_main.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/shiny/_main.py b/shiny/_main.py
index 385fab84d..e32aa078e 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -188,6 +188,9 @@ def run_app(
         hot-reload. Set to 0 to use a random port.
     reload
         Enable auto-reload.
+    reload_dirs
+        List of directories (in addition to the app directory) to watch for changes that
+        will trigger app reloading.
     ws_max_size
         WebSocket max size message in bytes.
     log_level
@@ -274,6 +277,7 @@ def run_app(
             # Adding `reload_includes` param while `reload=False` produces an warning
             # https://github.com/encode/uvicorn/blob/d43afed1cfa018a85c83094da8a2dd29f656d676/uvicorn/config.py#L298-L304
             "reload_includes": ["*.py", "*.css", "*.js", "*.htm", "*.html", "*.png"],
+            "reload_excludes": [".*", "*.py[cod]", "__pycache__", "env", "venv"],
             "reload_dirs": reload_dirs,
         }
 
@@ -504,4 +508,5 @@ def get_shiny_deps() -> None:
 class ReloadArgs(TypedDict):
     reload: NotRequired[bool]
     reload_includes: NotRequired[list[str]]
+    reload_excludes: NotRequired[list[str]]
     reload_dirs: NotRequired[list[str]]

From 8320d1ef5a4c2c088589e1bfed79b00da7b153cd Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 9 Oct 2023 20:05:27 -0500
Subject: [PATCH 11/20] Add --reload-includes option

---
 shiny/_main.py | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/shiny/_main.py b/shiny/_main.py
index e32aa078e..db881ce11 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -30,6 +30,8 @@ def main() -> None:
 
 stop_shortcut = "Ctrl+C"
 
+RELOAD_INCLUDES_DEFAULT = ("*.py", "*.css", "*.js", "*.htm", "*.html", "*.png")
+
 
 @main.command(
     help=f"""Run a Shiny app (press {stop_shortcut} to stop).
@@ -76,7 +78,7 @@ def main() -> None:
     "--reload",
     is_flag=True,
     default=False,
-    help="Enable auto-reload, when these types of files change: .py .css .js .html",
+    help="Enable auto-reload. See --reload-includes for types of files that are monitored for changes.",
 )
 @click.option(
     "--reload-dir",
@@ -86,6 +88,13 @@ def main() -> None:
     "addition to the app's parent directory. Can be used more than once.",
     type=click.Path(exists=True),
 )
+@click.option(
+    "--reload-includes",
+    "reload_includes",
+    default=",".join(RELOAD_INCLUDES_DEFAULT),
+    help="File glob(s) to indicate which files should be monitored for changes. Defaults"
+    f' to "{",".join(RELOAD_INCLUDES_DEFAULT)}".',
+)
 @click.option(
     "--ws-max-size",
     type=int,
@@ -131,12 +140,14 @@ def run(
     autoreload_port: int,
     reload: bool,
     reload_dirs: tuple[str, ...],
+    reload_includes: str,
     ws_max_size: int,
     log_level: str,
     app_dir: str,
     factory: bool,
     launch_browser: bool,
 ) -> None:
+    reload_includes_list = reload_includes.split(",")
     return run_app(
         app,
         host=host,
@@ -144,6 +155,7 @@ def run(
         autoreload_port=autoreload_port,
         reload=reload,
         reload_dirs=list(reload_dirs),
+        reload_includes=reload_includes_list,
         ws_max_size=ws_max_size,
         log_level=log_level,
         app_dir=app_dir,
@@ -159,6 +171,7 @@ def run_app(
     autoreload_port: int = 0,
     reload: bool = False,
     reload_dirs: Optional[list[str]] = None,
+    reload_includes: list[str] | tuple[str, ...] = RELOAD_INCLUDES_DEFAULT,
     ws_max_size: int = 16777216,
     log_level: Optional[str] = None,
     app_dir: Optional[str] = ".",
@@ -191,6 +204,9 @@ def run_app(
     reload_dirs
         List of directories (in addition to the app directory) to watch for changes that
         will trigger app reloading.
+    reload_includes
+        List or tuple of file globs to indicate which files should be monitored for
+        changes.
     ws_max_size
         WebSocket max size message in bytes.
     log_level
@@ -276,7 +292,7 @@ def run_app(
             "reload": reload,
             # Adding `reload_includes` param while `reload=False` produces an warning
             # https://github.com/encode/uvicorn/blob/d43afed1cfa018a85c83094da8a2dd29f656d676/uvicorn/config.py#L298-L304
-            "reload_includes": ["*.py", "*.css", "*.js", "*.htm", "*.html", "*.png"],
+            "reload_includes": list(reload_includes),
             "reload_excludes": [".*", "*.py[cod]", "__pycache__", "env", "venv"],
             "reload_dirs": reload_dirs,
         }

From e086c1a512baacd2b6adeec881f806cfe614538c Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 9 Oct 2023 21:33:34 -0500
Subject: [PATCH 12/20] Bump version to 0.5.1.9002

---
 shiny/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shiny/__init__.py b/shiny/__init__.py
index 4e85f8fc8..66c6356e5 100644
--- a/shiny/__init__.py
+++ b/shiny/__init__.py
@@ -1,6 +1,6 @@
 """A package for building reactive web applications."""
 
-__version__ = "0.5.1.9001"
+__version__ = "0.5.1.9002"
 
 from ._shinyenv import is_pyodide as _is_pyodide
 

From 0f2a3e7d67c89b2386e9132c70c2b81d72b4057c Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 9 Oct 2023 23:32:09 -0500
Subject: [PATCH 13/20] Add support for server-global and server-session
 contexts

---
 shiny/quarto.py | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/shiny/quarto.py b/shiny/quarto.py
index 699e4b689..b8b33db95 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -10,10 +10,12 @@
 from ._typing_extensions import NotRequired, TypedDict
 
 QuartoShinyCodeCellClass = Literal["python", "r", "cell-code", "hidden"]
+QuartoShinyCodeCellContext = Literal["ui", "server-session", "server-global"]
 
 
 class QuartoShinyCodeCell(TypedDict):
     text: str
+    context: list[QuartoShinyCodeCellContext]
     classes: list[QuartoShinyCodeCellClass]
 
 
@@ -39,25 +41,32 @@ def convert_code_cells_to_app_py(json_file: str | Path, app_file: str | Path) ->
 
     cells = data["cells"]
 
-    code_cell_texts: list[str] = []
+    session_code_cell_texts: list[str] = []
+    global_code_cell_texts: list[str] = []
 
     for cell in cells:
         if "python" not in cell["classes"]:
             continue
 
-        if "# skip" in cell["text"]:
-            continue
-
-        code_cell_texts.append(
-            indent(cell["text"], "    ") + "\n\n    # ============================\n"
-        )
+        if "server-global" in cell["context"]:
+            global_code_cell_texts.append(
+                cell["text"] + "\n\n# ============================\n"
+            )
+        elif "server-session" in cell["context"]:
+            session_code_cell_texts.append(
+                indent(cell["text"], "    ")
+                + "\n\n    # ============================\n"
+            )
 
     app_content = f"""
 from pathlib import Path
 from shiny import App, Inputs, Outputs, Session, ui
 
+{ "".join(global_code_cell_texts) }
+
+
 def server(input: Inputs, output: Outputs, session: Session) -> None:
-{ "".join(code_cell_texts) }
+{ "".join(session_code_cell_texts) }
 
 app = App(
     Path(__file__).parent / "{ data["html_file"] }",

From b5c00b44e38c96e025cb2ae3bf401ef342fa115e Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 9 Oct 2023 23:33:01 -0500
Subject: [PATCH 14/20] Bump version to 0.5.1.9003

---
 shiny/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shiny/__init__.py b/shiny/__init__.py
index 66c6356e5..3dfbe25cb 100644
--- a/shiny/__init__.py
+++ b/shiny/__init__.py
@@ -1,6 +1,6 @@
 """A package for building reactive web applications."""
 
-__version__ = "0.5.1.9002"
+__version__ = "0.5.1.9003"
 
 from ._shinyenv import is_pyodide as _is_pyodide
 

From 5bbc1a67a0b01f1119501f8938aa38ac21730737 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Tue, 10 Oct 2023 11:00:07 -0500
Subject: [PATCH 15/20] Formatting update

---
 shiny/quarto.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/shiny/quarto.py b/shiny/quarto.py
index b8b33db95..abaa9ada1 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -49,13 +49,10 @@ def convert_code_cells_to_app_py(json_file: str | Path, app_file: str | Path) ->
             continue
 
         if "server-global" in cell["context"]:
-            global_code_cell_texts.append(
-                cell["text"] + "\n\n# ============================\n"
-            )
+            global_code_cell_texts.append(cell["text"] + "\n\n# " + "=" * 72 + "\n\n")
         elif "server-session" in cell["context"]:
             session_code_cell_texts.append(
-                indent(cell["text"], "    ")
-                + "\n\n    # ============================\n"
+                indent(cell["text"], "    ") + "\n\n    # " + "=" * 72 + "\n\n"
             )
 
     app_content = f"""

From 08a0d8f17afd598935f185e2b480251f3b2c8d79 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Tue, 10 Oct 2023 17:08:19 -0500
Subject: [PATCH 16/20] Remove old comment

---
 shiny/_app.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shiny/_app.py b/shiny/_app.py
index 8f5b3ec67..4461fcdfa 100644
--- a/shiny/_app.py
+++ b/shiny/_app.py
@@ -397,7 +397,6 @@ def _render_page_from_file(self, file: Path, lib_prefix: str) -> RenderedHTML:
         rendered = doc.render(lib_prefix=lib_prefix)
         self._ensure_web_dependencies(rendered["dependencies"])
 
-        # TODO: scan for inlined <script> deps, inject them as well.
         return rendered
 
 

From e8895750fbe9d14f2aa2ba238a53a04fbc88f1ee Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Tue, 10 Oct 2023 17:16:30 -0500
Subject: [PATCH 17/20] Remove default for output py file

---
 shiny/_main.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/shiny/_main.py b/shiny/_main.py
index db881ce11..ae52ac963 100644
--- a/shiny/_main.py
+++ b/shiny/_main.py
@@ -508,11 +508,8 @@ def static_assets(command: str) -> None:
 @click.argument(
     "py_file",
     type=str,
-    default=None,
 )
-def cells_to_app(json_file: str, py_file: str | None) -> None:
-    if py_file is None:
-        py_file = str(Path(json_file).parent / "app.py")
+def cells_to_app(json_file: str, py_file: str) -> None:
     shiny.quarto.convert_code_cells_to_app_py(json_file, py_file)
 
 

From 0a62b6bbd07cc80e214bfeb8557b3bb9e794552b Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Wed, 11 Oct 2023 16:08:45 -0500
Subject: [PATCH 18/20] Use new context names

---
 shiny/quarto.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/shiny/quarto.py b/shiny/quarto.py
index abaa9ada1..16e3bbfa9 100644
--- a/shiny/quarto.py
+++ b/shiny/quarto.py
@@ -10,7 +10,7 @@
 from ._typing_extensions import NotRequired, TypedDict
 
 QuartoShinyCodeCellClass = Literal["python", "r", "cell-code", "hidden"]
-QuartoShinyCodeCellContext = Literal["ui", "server-session", "server-global"]
+QuartoShinyCodeCellContext = Literal["ui", "server", "server-setup"]
 
 
 class QuartoShinyCodeCell(TypedDict):
@@ -48,9 +48,9 @@ def convert_code_cells_to_app_py(json_file: str | Path, app_file: str | Path) ->
         if "python" not in cell["classes"]:
             continue
 
-        if "server-global" in cell["context"]:
+        if "server-setup" in cell["context"]:
             global_code_cell_texts.append(cell["text"] + "\n\n# " + "=" * 72 + "\n\n")
-        elif "server-session" in cell["context"]:
+        elif "server" in cell["context"]:
             session_code_cell_texts.append(
                 indent(cell["text"], "    ") + "\n\n    # " + "=" * 72 + "\n\n"
             )

From 996e56c6880cfbd0848eccfe6368ec1bea81dc98 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Wed, 11 Oct 2023 16:12:40 -0500
Subject: [PATCH 19/20] Revert output_fn changes

---
 shiny/render/_render.py                  | 11 +----------
 shiny/render/transformer/_transformer.py |  5 -----
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/shiny/render/_render.py b/shiny/render/_render.py
index 6bee649c8..00beb901f 100644
--- a/shiny/render/_render.py
+++ b/shiny/render/_render.py
@@ -89,16 +89,7 @@ def text(
     --------
     ~shiny.ui.output_text
     """
-    text_transformer_fn = TextTransformer(_fn)
-
-    def _output_ui_() -> str:
-        from .. import ui
-
-        return ui.output_text_verbatim(_fn.__name__, placeholder=True)._repr_html_()
-
-    text_transformer_fn._repr_html_ = _output_ui_
-
-    return text_transformer_fn
+    return TextTransformer(_fn)
 
 
 # ======================================================================================
diff --git a/shiny/render/transformer/_transformer.py b/shiny/render/transformer/_transformer.py
index 6d9bf956e..f206a8221 100644
--- a/shiny/render/transformer/_transformer.py
+++ b/shiny/render/transformer/_transformer.py
@@ -219,8 +219,6 @@ def __init__(
         *,
         value_fn: ValueFn[IT],
         transform_fn: TransformFn[IT, P, OT],
-        # TODO: Type should be Tag | TagChild | TagList ...
-        output_fn: Optional[Callable[[], object]] = None,
         params: TransformerParams[P],
     ) -> None:
         """
@@ -316,8 +314,6 @@ def __init__(
         value_fn: ValueFnSync[IT],
         transform_fn: TransformFn[IT, P, OT],
         params: TransformerParams[P],
-        # TODO: Type should be Tag | TagChild | TagList ...
-        output_fn: Optional[Callable[[], object]] = None,
     ) -> None:
         if is_async_callable(value_fn):
             raise TypeError(
@@ -327,7 +323,6 @@ def __init__(
         super().__init__(
             value_fn=value_fn,
             transform_fn=transform_fn,
-            output_fn=output_fn,
             params=params,
         )
 

From 1c683aa21fe51e832a3ab13f2e29d22b9cf7bfc6 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Wed, 11 Oct 2023 16:33:15 -0500
Subject: [PATCH 20/20] Get py-htmltools from github

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 43fea1214..698fd3181 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,7 +37,7 @@ install_requires =
     starlette>=0.17.1
     websockets>=10.0
     python-multipart
-    htmltools>=0.3.0.9000
+    htmltools @ git+https://github.com/posit-dev/py-htmltools.git
     click>=8.1.4
     markdown-it-py>=1.1.0
     # This is needed for markdown-it-py. Without it, when loading shiny/ui/_markdown.py,