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

Author: masenf

pyi_hashes.json

@@ -14,7 +14,6 @@
   "reflex/components/core/__init__.pyi": "007170b97e58bdf28b2aee381d91c0c7",
   "reflex/components/core/auto_scroll.pyi": "10c4cf71d0d0c1d46a8e1205bd119c11",
   "reflex/components/core/banner.pyi": "3c07547afc4f215aefd5e5afa409aa25",
-  "reflex/components/core/client_side_routing.pyi": "57a7917e993f625c623bcef50b60b804",
   "reflex/components/core/clipboard.pyi": "a844eb927d9bc2a43f5e88161b258539",
   "reflex/components/core/debounce.pyi": "055da7aa890f44fb4d48bd5978f1a874",
   "reflex/components/core/helmet.pyi": "43f8497c8fafe51e29dca1dd535d143a",

reflex/.templates/web/app/routes.js

@@ -2,7 +2,6 @@ import { route } from "@react-router/dev/routes";
 import { flatRoutes } from "@react-router/fs-routes";
 
 export default [
-  route("404", "routes/[404]._index.jsx", { id: "404" }),
   ...(await flatRoutes({
     ignoredRouteFiles: ["routes/\\[404\\]._index.jsx"],
   })),

reflex/.templates/web/utils/client_side_routing.js

@@ -67,10 +67,6 @@
     connection_toaster,
 )
 from reflex.components.core.breakpoints import set_breakpoints
-from reflex.components.core.client_side_routing import (
-    default_404_page,
-    wait_for_client_redirect,
-)
 from reflex.components.core.sticky import sticky
 from reflex.components.core.upload import Upload, get_upload_dir
 from reflex.components.radix import themes
@@ -775,8 +771,10 @@ def add_page(
 
         if route == constants.Page404.SLUG:
             if component is None:
-                component = default_404_page
-            component = wait_for_client_redirect(self._generate_component(component))
+                from reflex.components.el.elements import span
+
+                component = span("404: Page not found")
+            component = self._generate_component(component)
             title = title or constants.Page404.TITLE
             description = description or constants.Page404.DESCRIPTION
             image = image or constants.Page404.IMAGE
@@ -1312,7 +1310,9 @@ def memoized_toast_provider():
                 self.head_components,
                 html_lang=self.html_lang,
                 html_custom_attrs=(
-                    {**self.html_custom_attrs} if self.html_custom_attrs else {}
+                    {"suppressHydrationWarning": "true", **self.html_custom_attrs}
+                    if self.html_custom_attrs
+                    else {"suppressHydrationWarning": "true"}
                 ),
             )
         )

reflex/app.py

@@ -37,7 +37,7 @@
     PageNames,
 )
 from reflex.constants.compiler import SpecialAttributes
-from reflex.constants.state import FRONTEND_EVENT_STATE
+from reflex.constants.state import FRONTEND_EVENT_STATE, MEMO_MARKER
 from reflex.event import (
     EventCallback,
     EventChain,
@@ -2005,7 +2005,7 @@ def get_args_spec(key: str) -> types.ArgsSpec | Sequence[types.ArgsSpec]:
 
         super()._post_init(
             event_triggers={
-                key: EventChain.create(
+                key + MEMO_MARKER: EventChain.create(
                     value=props[key],
                     args_spec=get_args_spec(key),
                     key=key,
@@ -2016,7 +2016,9 @@ def get_args_spec(key: str) -> types.ArgsSpec | Sequence[types.ArgsSpec]:
         )
 
         to_camel_cased_props = {
-            format.to_camel_case(key) for key in props if key not in event_types
+            format.to_camel_case(key + MEMO_MARKER)
+            for key in props
+            if key not in event_types
         }
         self.get_props = lambda: to_camel_cased_props  # pyright: ignore [reportIncompatibleVariableOverride]
 
@@ -2031,7 +2033,7 @@ def get_args_spec(key: str) -> types.ArgsSpec | Sequence[types.ArgsSpec]:
             if key not in props_types:
                 continue
 
-            camel_cased_key = format.to_camel_case(key)
+            camel_cased_key = format.to_camel_case(key + MEMO_MARKER)
 
             # Get the type based on the annotation.
             type_ = props_types[key]

reflex/components/component.py

@@ -254,6 +254,9 @@ class BaseConfig:
     # List of fully qualified import paths of plugins to disable in the app (e.g. reflex.plugins.sitemap.SitemapPlugin).
     disable_plugins: list[str] = dataclasses.field(default_factory=list)
 
+    # Whether to skip plugin checks.
+    _skip_plugins_checks: bool = dataclasses.field(default=False, repr=False)
+
     _prefixes: ClassVar[list[str]] = ["REFLEX_"]
 
 
@@ -284,6 +287,9 @@ class Config(BaseConfig):
     See the [configuration](https://reflex.dev/docs/getting-started/configuration/) docs for more info.
     """
 
+    # Track whether the app name has already been validated for this Config instance.
+    _app_name_is_valid: bool = dataclasses.field(default=False, repr=False)
+
     def _post_init(self, **kwargs):
         """Post-initialization method to set up the config.
 
@@ -315,7 +321,8 @@ def _post_init(self, **kwargs):
             setattr(self, key, env_value)
 
         # Add builtin plugins if not disabled.
-        self._add_builtin_plugins()
+        if not self._skip_plugins_checks:
+            self._add_builtin_plugins()
 
         #   Update default URLs if ports were set
         kwargs.update(env_kwargs)
@@ -531,7 +538,7 @@ def _get_config() -> Config:
     if not spec:
         # we need this condition to ensure that a ModuleNotFound error is not thrown when
         # running unit/integration tests or during `reflex init`.
-        return Config(app_name="")
+        return Config(app_name="", _skip_plugins_checks=True)
     rxconfig = importlib.import_module(constants.Config.MODULE)
     return rxconfig.config
 

reflex/components/core/client_side_routing.py

@@ -174,6 +174,8 @@ class ReactRouter(Javascript):
         rf"(?:{DEV_FRONTEND_LISTENING_REGEX}|{PROD_FRONTEND_LISTENING_REGEX})(.*)"
     )
 
+    SPA_FALLBACK = "__spa-fallback.html"
+
 
 # Color mode variables
 class ColorMode(SimpleNamespace):

reflex/config.py

@@ -106,7 +106,7 @@ class Commands(SimpleNamespace):
 
         DEV = "react-router dev --host"
         EXPORT = "react-router build"
-        PROD = "serve ./build/client"
+        PROD = "sirv ./build/client --single 404.html --host"
 
     PATH = "package.json"
 
@@ -127,7 +127,7 @@ def DEPENDENCIES(cls) -> dict[str, str]:
             "react-router": cls._react_router_version,
             "react-router-dom": cls._react_router_version,
             "@react-router/node": cls._react_router_version,
-            "serve": "14.2.4",
+            "sirv-cli": "3.0.1",
             "react": cls._react_version,
             "react-helmet": "6.1.0",
             "react-dom": cls._react_version,

reflex/constants/base.py

@@ -15,3 +15,4 @@ class StateManagerMode(str, Enum):
 FRONTEND_EVENT_STATE = "__reflex_internal_frontend_event_state"
 
 FIELD_MARKER = "_rx_state_"
+MEMO_MARKER = "_rx_memo_"