Merge branch 'main' into khaleel/eng-7266-since-v08-redirects-from-on_load-and-on_mount-handlers-are

Author: adhami3310

pyi_hashes.json

@@ -40,7 +40,7 @@
   "reflex/components/el/elements/tables.pyi": "e3f299e59bb8ff87aa949c6b606551c9",
   "reflex/components/el/elements/typography.pyi": "b4ec4ffb448f7a9b5f94712404448d9e",
   "reflex/components/gridjs/datatable.pyi": "98a7e1b3f3b60cafcdfcd8879750ee42",
-  "reflex/components/lucide/icon.pyi": "eb7929c0d708ddbbe8ed4849cd4aa5ce",
+  "reflex/components/lucide/icon.pyi": "020db5c37c5a6bee5912532a89d6deda",
   "reflex/components/markdown/markdown.pyi": "2f84254a548e908020949564fc289339",
   "reflex/components/moment/moment.pyi": "93fa4c6009390fe9400197ab52735b84",
   "reflex/components/plotly/plotly.pyi": "4311a0aae2abcc9226abb6a273f96372",

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "reflex"
-version = "0.8.6dev1"
+version = "0.8.7dev1"
 description = "Web apps in pure Python."
 license.text = "Apache-2.0"
 authors = [
@@ -32,7 +32,7 @@ dependencies = [
   "python-multipart >=0.0.20,<1.0",
   "python-socketio >=5.12.0,<6.0",
   "redis >=5.2.1,<7.0",
-  "reflex-hosting-cli >=0.1.53",
+  "reflex-hosting-cli >=0.1.54",
   "rich >=13,<15",
   "sqlmodel >=0.0.24,<0.1",
   "starlette >=0.47.0",
@@ -233,7 +233,7 @@ fail_fast = true
 
 [[tool.pre-commit.repos]]
 repo = "https://github.com/astral-sh/ruff-pre-commit"
-rev = "v0.12.7"
+rev = "v0.12.8"
 hooks = [
   { id = "ruff-format", args = [
     "reflex",

reflex/.templates/jinja/web/vite.config.js.jinja2

@@ -46,6 +46,9 @@ export default defineConfig((config) => ({
       },
     },
   },
+  experimental: {
+    enableNativePlugin: false,
+  },
   server: {
     port: process.env.PORT,
     watch: {

reflex/app.py

@@ -109,6 +109,8 @@
     console,
     exceptions,
     format,
+    frontend_skeleton,
+    js_runtimes,
     path_ops,
     prerequisites,
     types,
@@ -598,10 +600,6 @@ def __call__(self) -> ASGIApp:
         """
         from reflex.vars.base import GLOBAL_CACHE
 
-        # For py3.9 compatibility when redis is used, we MUST add any decorator pages
-        # before compiling the app in a thread to avoid event loop error (REF-2172).
-        self._apply_decorated_pages()
-
         self._compile(prerender_routes=is_prod_mode())
 
         config = get_config()
@@ -992,7 +990,7 @@ def _get_frontend_packages(self, imports: dict[str, set[ImportVar]]):
                 continue
             _frontend_packages.append(package)
         page_imports.update(_frontend_packages)
-        prerequisites.install_frontend_packages(page_imports, get_config())
+        js_runtimes.install_frontend_packages(page_imports, get_config())
 
     def _app_root(self, app_wrappers: dict[tuple[int, str], Component]) -> Component:
         for component in tuple(app_wrappers.values()):
@@ -1065,16 +1063,8 @@ def memoized_badge():
         self.app_wraps[(0, "StickyBadge")] = lambda _: memoized_badge()
 
     def _apply_decorated_pages(self):
-        """Add @rx.page decorated pages to the app.
-
-        This has to be done in the MainThread for py38 and py39 compatibility, so the
-        decorated pages are added to the app before the app is compiled (in a thread)
-        to workaround REF-2172.
-
-        This can move back into `compile_` when py39 support is dropped.
-        """
+        """Add @rx.page decorated pages to the app."""
         app_name = get_config().app_name
-        # Add the @rx.page decorated pages to collect on_load events.
         for render, kwargs in DECORATED_PAGES[app_name]:
             self.add_page(render, **kwargs)
 
@@ -1124,6 +1114,8 @@ def _compile(self, prerender_routes: bool = False, dry_run: bool = False):
         """
         from reflex.utils.exceptions import ReflexRuntimeError
 
+        self._apply_decorated_pages()
+
         self._pages = {}
 
         def get_compilation_time() -> str:
@@ -1440,7 +1432,7 @@ def _submit_work_without_advancing(
             self._get_frontend_packages(all_imports)
 
         # Setup the react-router.config.js
-        prerequisites.update_react_router_config(
+        frontend_skeleton.update_react_router_config(
             prerender_routes=prerender_routes,
         )
 

reflex/components/lucide/icon.py

@@ -6,7 +6,7 @@
 from reflex.vars.base import LiteralVar, Var
 from reflex.vars.sequence import LiteralStringVar, StringVar
 
-LUCIDE_LIBRARY = "lucide-react@0.536.0"
+LUCIDE_LIBRARY = "lucide-react@0.539.0"
 
 
 class LucideIconComponent(Component):
@@ -343,6 +343,7 @@ def _get_imports(self):
     "brain_cog",
     "brain",
     "brick_wall_fire",
+    "brick_wall_shield",
     "brick_wall",
     "briefcase_business",
     "briefcase_conveyor_belt",
@@ -494,6 +495,7 @@ def _get_imports(self):
     "circle_slash_2",
     "circle_slash",
     "circle_small",
+    "circle_star",
     "circle_stop",
     "circle_user_round",
     "circle_user",
@@ -950,6 +952,7 @@ def _get_imports(self):
     "japanese_yen",
     "joystick",
     "kanban",
+    "kayak",
     "key_round",
     "key_square",
     "key",

reflex/components/plotly/plotly.py

@@ -72,7 +72,7 @@ class Plotly(NoSSRComponent):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js@3.1.0"]
 
     tag = "Plot"
 
@@ -303,7 +303,7 @@ class PlotlyBasic(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-basic-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-basic-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly basic component.
@@ -329,7 +329,7 @@ class PlotlyCartesian(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-cartesian-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-cartesian-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly cartesian component.
@@ -355,7 +355,7 @@ class PlotlyGeo(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-geo-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-geo-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly geo component.
@@ -381,7 +381,7 @@ class PlotlyGl3d(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-gl3d-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-gl3d-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly 3d component.
@@ -407,7 +407,7 @@ class PlotlyGl2d(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-gl2d-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-gl2d-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly 2d component.
@@ -433,7 +433,7 @@ class PlotlyMapbox(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-mapbox-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-mapbox-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly mapbox component.
@@ -459,7 +459,7 @@ class PlotlyFinance(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-finance-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-finance-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly finance component.
@@ -485,7 +485,7 @@ class PlotlyStrict(Plotly):
 
     library = "[email protected]"
 
-    lib_dependencies: list[str] = ["plotly.js-strict-dist-min@3.0.3"]
+    lib_dependencies: list[str] = ["plotly.js-strict-dist-min@3.1.0"]
 
     def add_imports(self) -> ImportDict | list[ImportDict]:
         """Add imports for the plotly strict component.

reflex/components/recharts/recharts.py

@@ -8,7 +8,7 @@
 class Recharts(Component):
     """A component that wraps a recharts lib."""
 
-    library = "[email protected].0"
+    library = "[email protected].2"
 
     def _get_style(self) -> dict:
         return {"wrapperStyle": self.style}
@@ -17,7 +17,7 @@ def _get_style(self) -> dict:
 class RechartsCharts(NoSSRComponent, MemoizationLeaf):
     """A component that wraps a recharts lib."""
 
-    library = "[email protected].0"
+    library = "[email protected].2"
 
 
 LiteralAnimationEasing = Literal["ease", "ease-in", "ease-out", "ease-in-out", "linear"]

reflex/constants/installer.py

@@ -14,7 +14,7 @@ class Bun(SimpleNamespace):
     """Bun constants."""
 
     # The Bun version.
-    VERSION = "1.2.19"
+    VERSION = "1.2.20"
 
     # Min Bun Version
     MIN_VERSION = "1.2.17"
@@ -75,7 +75,7 @@ class Node(SimpleNamespace):
 
 
 def _determine_react_router_version() -> str:
-    default_version = "7.7.1"
+    default_version = "7.8.0"
     if (version := os.getenv("REACT_ROUTER_VERSION")) and version != default_version:
         from reflex.utils import console
 
@@ -143,11 +143,11 @@ def DEPENDENCIES(cls) -> dict[str, str]:
         "postcss-import": "16.1.1",
         "@react-router/dev": _react_router_version,
         "@react-router/fs-routes": _react_router_version,
-        "vite": "npm:rolldown-vite@7.0.12",
+        "vite": "npm:rolldown-vite@7.1.2",
     }
     OVERRIDES = {
         # This should always match the `react` version in DEPENDENCIES for recharts compatibility.
         "react-is": _react_version,
         "cookie": "1.0.2",
-        "vite": "npm:rolldown-vite@7.0.12",
+        "vite": "npm:rolldown-vite@7.1.2",
     }

reflex/custom_components/custom_components.py

@@ -15,7 +15,7 @@
 
 from reflex import constants
 from reflex.constants import CustomComponents
-from reflex.utils import console
+from reflex.utils import console, frontend_skeleton
 
 
 def set_loglevel(ctx: Any, self: Any, value: str | None):
@@ -328,7 +328,7 @@ def init(
     Raises:
         Exit: If the pyproject.toml already exists.
     """
-    from reflex.utils import exec, prerequisites
+    from reflex.utils import exec
 
     if CustomComponents.PYPROJECT_TOML.exists():
         console.error(f"A {CustomComponents.PYPROJECT_TOML} already exists. Aborting.")
@@ -347,7 +347,7 @@ def init(
     _populate_demo_app(name_variants)
 
     # Initialize the .gitignore.
-    prerequisites.initialize_gitignore(
+    frontend_skeleton.initialize_gitignore(
         gitignore_file=CustomComponents.FILE, files_to_ignore=CustomComponents.DEFAULTS
     )
 

reflex/reflex.py

@@ -58,7 +58,7 @@ def _init(
     ai: bool = False,
 ):
     """Initialize a new Reflex app in the given directory."""
-    from reflex.utils import exec, prerequisites
+    from reflex.utils import exec, frontend_skeleton, prerequisites, templates
 
     # Show system info
     exec.output_system_info()
@@ -80,13 +80,13 @@ def _init(
     prerequisites.initialize_frontend_dependencies()
 
     # Initialize the app.
-    template = prerequisites.initialize_app(app_name, template)
+    template = templates.initialize_app(app_name, template)
 
     # Initialize the .gitignore.
-    prerequisites.initialize_gitignore()
+    frontend_skeleton.initialize_gitignore()
 
     # Initialize the requirements.txt.
-    needs_user_manual_update = prerequisites.initialize_requirements_txt()
+    needs_user_manual_update = frontend_skeleton.initialize_requirements_txt()
 
     template_msg = f" using the {template} template" if template else ""
     # Finish initializing the app.
@@ -371,7 +371,7 @@ def compile(dry: bool):
         _init(name=get_config().app_name)
     get_config(reload=True)
     starting_time = time.monotonic()
-    prerequisites.compile_app(dry_run=dry)
+    prerequisites.get_compiled_app(dry_run=dry)
     elapsed_time = time.monotonic() - starting_time
     console.success(f"App compiled successfully in {elapsed_time:.3f} seconds.")
 
@@ -737,9 +737,10 @@ def deploy(
 def rename(new_name: str):
     """Rename the app in the current directory."""
     from reflex.utils import prerequisites
+    from reflex.utils.rename import rename_app
 
     prerequisites.validate_app_name(new_name)
-    prerequisites.rename_app(new_name, get_config().loglevel)
+    rename_app(new_name, get_config().loglevel)
 
 
 if TYPE_CHECKING: