Merge branch 'worktree-iso-phase-1' into macros

# Conflicts:
#	shared/sx/helpers.py
#	shared/sx/pages.py
#	sx/sx/nav-data.sx
#	sx/sx/plans.sx
#	sx/sxc/pages/docs.sx

shared/sx/pages.py

@@ -282,7 +282,7 @@ async def execute_page(
         # Compute content expression deps so the server sends component
         # definitions the client needs for future client-side routing
         extra_deps: set[str] | None = None
-        if page_def.content_expr is not None:
+        if page_def.content_expr is not None and page_def.data_expr is None:
             from .deps import components_needed
             from .parser import serialize
             try: