Merge remote-tracking branch 'origin/main' into release/reflex-0.8.22

Author: adhami3310

reflex/compiler/templates.py

@@ -581,9 +581,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

@@ -2263,9 +2263,9 @@ 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)"
         )
         return (
             f"const {self.alias or self.tag} = ClientSide(lazy(() => "

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",
     ]
 

reflex/utils/processes.py

@@ -450,11 +450,12 @@ def show_progress(message: str, process: subprocess.Popen, checkpoints: list[str
         task = progress.add_task(f"{message}: ", total=len(checkpoints))
         for line in stream_logs(message, process, progress=progress):
             # Check for special strings and update the progress bar.
-            special_string = checkpoints[0]
-            if special_string in line:
-                progress.update(task, advance=1)
-                checkpoints.pop(0)
-            if not checkpoints:
+            while checkpoints:
+                special_string = checkpoints[0]
+                if special_string in line:
+                    progress.update(task, advance=1)
+                    checkpoints.pop(0)
+                    continue
                 break
 
 

tests/integration/test_lifespan.py

@@ -99,7 +99,9 @@ def index():
 
 
 @pytest.fixture(
-    params=[False, True], ids=["no_api_transformer", "mount_api_transformer"]
+    scope="session",
+    params=[False, True],
+    ids=["no_api_transformer", "mount_api_transformer"],
 )
 def mount_api_transformer(request: pytest.FixtureRequest) -> bool:
     """Whether to use api_transformer in the app.
@@ -113,7 +115,9 @@ def mount_api_transformer(request: pytest.FixtureRequest) -> bool:
     return request.param
 
 
-@pytest.fixture(params=[False, True], ids=["no_fastapi", "mount_cached_fastapi"])
+@pytest.fixture(
+    scope="session", params=[False, True], ids=["no_fastapi", "mount_cached_fastapi"]
+)
 def mount_cached_fastapi(request: pytest.FixtureRequest) -> bool:
     """Whether to use cached FastAPI in the app (app.api).
 
@@ -126,22 +130,26 @@ def mount_cached_fastapi(request: pytest.FixtureRequest) -> bool:
     return request.param
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def lifespan_app(
-    tmp_path, mount_api_transformer: bool, mount_cached_fastapi: bool
+    tmp_path_factory: pytest.TempPathFactory,
+    app_harness_env: type[AppHarness],
+    mount_api_transformer: bool,
+    mount_cached_fastapi: bool,
 ) -> Generator[AppHarness, None, None]:
     """Start LifespanApp app at tmp_path via AppHarness.
 
     Args:
-        tmp_path: pytest tmp_path fixture
+        tmp_path_factory: pytest tmp_path_factory fixture
+        app_harness_env: AppHarness environment
         mount_api_transformer: Whether to mount the API transformer.
         mount_cached_fastapi: Whether to mount the cached FastAPI app.
 
     Yields:
         running AppHarness instance
     """
-    with AppHarness.create(
-        root=tmp_path,
+    with app_harness_env.create(
+        root=tmp_path_factory.mktemp("lifespan_app"),
         app_source=functools.partial(
             LifespanApp,
             mount_cached_fastapi=mount_cached_fastapi,