Merge remote-tracking branch 'origin/main' into masenf/linked-state

Author: masenf

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.8.22dev1"
+version = "0.8.23dev1"
 description = "Web apps in pure Python."
 license.text = "Apache-2.0"
 authors = [

reflex/compiler/templates.py

@@ -378,7 +378,11 @@ def context_template(
   return ({{ children, ...props }}) => {{
     const [Component, setComponent] = useState(null);
     useEffect(() => {{
-      setComponent(component);
+      async function load() {{
+        const comp = await component();
+        setComponent(() => comp);
+      }}
+      load();
     }}, []);
     return Component ? jsx(Component, props, children) : null;
   }};
@@ -581,9 +585,6 @@ def vite_config_template(
     enableNativePlugin: false,
     hmr: {"true" if experimental_hmr else "false"},
   }},
-  legacy: {{
-    inconsistentCjsInterop: true,
-  }},
   server: {{
     port: process.env.PORT,
     hmr: {"true" if hmr else "false"},

reflex/components/component.py

@@ -2232,7 +2232,6 @@ def _get_imports(self) -> ParsedImportDict:
         """
         # React lazy import mechanism.
         dynamic_import = {
-            "react": [ImportVar(tag="lazy")],
             f"$/{constants.Dirs.UTILS}/context": [ImportVar(tag="ClientSide")],
         }
 
@@ -2263,15 +2262,15 @@ def _get_dynamic_imports(self) -> str:
         library_import = f"import('{import_name}')"
         mod_import = (
             # https://nextjs.org/docs/pages/building-your-application/optimizing/lazy-loading#with-named-exports
-            f".then((mod) => ({{default: mod.{self.tag}}}))"
+            f".then((mod) => mod.{self.tag})"
             if not self.is_default
-            else ""
+            else ".then((mod) => mod.default.default ?? mod.default)"
         )
         return (
-            f"const {self.alias or self.tag} = ClientSide(lazy(() => "
+            f"const {self.alias or self.tag} = ClientSide(() => "
             + library_import
             + mod_import
-            + "))"
+            + ")"
         )
 
 

reflex/components/plotly/plotly.py

@@ -288,11 +288,11 @@ def dynamic_plotly_import(name: str, package: str) -> str:
         The dynamic import for the plotly component.
     """
     library_import = f"import('{package}')"
-    mod_import = ".then((mod) => ({ default: createPlotlyComponent(mod) }))"
+    mod_import = ".then((mod) => createPlotlyComponent(mod))"
     return f"""
-const {name} = ClientSide(lazy(() =>
+const {name} = ClientSide(() =>
     {library_import}{mod_import}
-))
+)
 """
 
 

reflex/constants/installer.py

@@ -14,7 +14,7 @@ class Bun(SimpleNamespace):
     """Bun constants."""
 
     # The Bun version.
-    VERSION = "1.3.3"
+    VERSION = "1.3.4"
 
     # Min Bun Version
     MIN_VERSION = "1.3.0"

reflex/environment.py

@@ -583,6 +583,9 @@ class EnvironmentVariables:
     # Path to the alembic config file
     ALEMBIC_CONFIG: EnvVar[ExistingPath] = env_var(Path(constants.ALEMBIC_CONFIG))
 
+    # Include schemas in alembic migrations.
+    ALEMBIC_INCLUDE_SCHEMAS: EnvVar[bool] = env_var(False)
+
     # Disable SSL verification for HTTPX requests.
     SSL_NO_VERIFY: EnvVar[bool] = env_var(False)
 

reflex/model.py

@@ -518,6 +518,7 @@ def run_autogenerate(rev: str, context: MigrationContext):
                     render_item=cls._alembic_render_item,
                     process_revision_directives=writer,
                     compare_type=False,
+                    include_schemas=environment.ALEMBIC_INCLUDE_SCHEMAS.get(),
                     render_as_batch=True,  # for sqlite compatibility
                 )
                 env.run_migrations()

reflex/state.py

@@ -1770,7 +1770,7 @@ def _is_valid_type(events: Any) -> bool:
         if events is None or _is_valid_type(events):
             return events
 
-        if not isinstance(events, Sequence):
+        if not (isinstance(events, Sequence) and not isinstance(events, (str, bytes))):
             events = [events]
 
         try:

reflex/testing.py

@@ -26,6 +26,7 @@
 from typing import TYPE_CHECKING, Any, Literal, TypeVar
 
 import uvicorn
+from typing_extensions import Self
 
 import reflex
 import reflex.reflex
@@ -131,7 +132,7 @@ def create(
             Callable[[], None] | types.ModuleType | str | functools.partial[Any] | None
         ) = None,
         app_name: str | None = None,
-    ) -> AppHarness:
+    ) -> Self:
         """Create an AppHarness instance at root.
 
         Args:
@@ -453,7 +454,7 @@ def consume_frontend_output():
         self.frontend_output_thread = threading.Thread(target=consume_frontend_output)
         self.frontend_output_thread.start()
 
-    def start(self) -> AppHarness:
+    def start(self) -> Self:
         """Start the backend in a new thread and dev frontend as a separate process.
 
         Returns:
@@ -482,7 +483,7 @@ def get_app_global_source(key: str, value: Any):
             return f"{key} = {value!r}"
         return inspect.getsource(value)
 
-    def __enter__(self) -> AppHarness:
+    def __enter__(self) -> Self:
         """Contextmanager protocol for `start()`.
 
         Returns:

reflex/utils/build.py

@@ -199,8 +199,9 @@ def build():
     path_ops.rm(str(wdir / constants.Dirs.BUILD_DIR))
 
     checkpoints = [
-        "building for production",
-        "building SSR bundle for production",
+        "building client environment for production...",
+        "modules transformed",
+        "building ssr environment for production...",
         "built in",
     ]