reflex 0.7.14a6__py3-none-any.whl → 0.8.0__py3-none-any.whl

reflex/constants/installer.py

@@ -14,10 +14,10 @@ class Bun(SimpleNamespace):
     """Bun constants."""
 
     # The Bun version.
-    VERSION = "1.2.15"
+    VERSION = "1.2.17"
 
     # Min Bun Version
-    MIN_VERSION = "1.2.8"
+    MIN_VERSION = "1.2.17"
 
     # URL to bun install script.
     INSTALL_URL = "https://raw.githubusercontent.com/reflex-dev/reflex/main/scripts/bun_install.sh"
@@ -63,7 +63,7 @@ class Node(SimpleNamespace):
     """Node/ NPM constants."""
 
     # The minimum required node version.
-    MIN_VERSION = "18.18.0"
+    MIN_VERSION = "20.19.0"
 
     # Path of the node config file.
     CONFIG_PATH = ".npmrc"
@@ -74,13 +74,13 @@ fetch-retries=0
 """
 
 
-def _determine_nextjs_version() -> str:
-    default_version = "15.3.2"
-    if (version := os.getenv("NEXTJS_VERSION")) and version != default_version:
+def _determine_react_router_version() -> str:
+    default_version = "7.6.2"
+    if (version := os.getenv("REACT_ROUTER_VERSION")) and version != default_version:
         from reflex.utils import console
 
         console.warn(
-            f"You have requested next@{version} but the supported version is {default_version}, abandon all hope ye who enter here."
+            f"You have requested react-router@{version} but the supported version is {default_version}, abandon all hope ye who enter here."
         )
         return version
     return default_version
@@ -104,15 +104,16 @@ class PackageJson(SimpleNamespace):
     class Commands(SimpleNamespace):
         """The commands to define in package.json."""
 
-        DEV = "next dev {flags}"
-        EXPORT = "next build {flags}"
-        EXPORT_SITEMAP = "next build {flags} && next-sitemap"
-        PROD = "next start"
+        DEV = "react-router dev"
+        EXPORT = "react-router build"
+        PROD = "serve ./build/client"
 
     PATH = "package.json"
 
     _react_version = _determine_react_version()
 
+    _react_router_version = _determine_react_router_version()
+
     @classproperty
     @classmethod
     def DEPENDENCIES(cls) -> dict[str, str]:
@@ -122,25 +123,30 @@ class PackageJson(SimpleNamespace):
             A dictionary of dependencies with their versions.
         """
         return {
-            "@emotion/react": "11.14.0",
-            "axios": "1.9.0",
             "json5": "2.2.3",
-            "next": _determine_nextjs_version(),
-            "next-sitemap": "4.2.3",
-            "next-themes": "0.4.6",
+            "react-router": cls._react_router_version,
+            "react-router-dom": cls._react_router_version,
+            "@react-router/node": cls._react_router_version,
+            "serve": "14.2.4",
             "react": cls._react_version,
+            "react-helmet": "6.1.0",
             "react-dom": cls._react_version,
-            "react-focus-lock": "2.13.6",
+            "isbot": "5.1.28",
             "socket.io-client": "4.8.1",
             "universal-cookie": "7.2.2",
         }
 
     DEV_DEPENDENCIES = {
+        "@emotion/react": "11.14.0",
         "autoprefixer": "10.4.21",
-        "postcss": "8.5.4",
-        "postcss-import": "16.1.0",
+        "postcss": "8.5.6",
+        "postcss-import": "16.1.1",
+        "@react-router/dev": _react_router_version,
+        "@react-router/fs-routes": _react_router_version,
+        "rolldown-vite": "7.0.1",
     }
     OVERRIDES = {
         # This should always match the `react` version in DEPENDENCIES for recharts compatibility.
-        "react-is": _react_version
+        "react-is": _react_version,
+        "cookie": "1.0.2",
     }

reflex/constants/route.py

@@ -36,16 +36,35 @@ ROUTER_DATA_INCLUDE = {RouteVar.PATH, RouteVar.ORIGIN, RouteVar.QUERY}
 class RouteRegex(SimpleNamespace):
     """Regex used for extracting route args in route."""
 
-    ARG = re.compile(r"\[(?!\.)([^\[\]]+)\]")
-    # group return the catchall pattern (i.e. "[[..slug]]")
-    CATCHALL = re.compile(r"(\[?\[\.{3}(?![0-9]).*\]?\])")
-    # group return the arg name (i.e. "slug")
-    STRICT_CATCHALL = re.compile(r"\[\.{3}([a-zA-Z_][\w]*)\]")
-    # group return the arg name (i.e. "slug") (optional arg can be empty)
-    OPT_CATCHALL = re.compile(r"\[\[\.{3}([a-zA-Z_][\w]*)\]\]")
+    _DOT_DOT_DOT = r"\.\.\."
+    _OPENING_BRACKET = r"\["
+    _CLOSING_BRACKET = r"\]"
+    _ARG_NAME = r"[a-zA-Z_]\w*"
+
+    # The regex for a valid arg name, e.g. "slug" in "[slug]"
+    _ARG_NAME_PATTERN = re.compile(_ARG_NAME)
+
+    SLUG = re.compile(r"[a-zA-Z0-9_-]+")
+    # match a single arg (i.e. "[slug]"), returns the name of the arg
+    ARG = re.compile(rf"{_OPENING_BRACKET}({_ARG_NAME}){_CLOSING_BRACKET}")
+    # match a single optional arg (i.e. "[[slug]]"), returns the name of the arg
+    OPTIONAL_ARG = re.compile(
+        rf"{_OPENING_BRACKET * 2}({_ARG_NAME}){_CLOSING_BRACKET * 2}"
+    )
+
+    # match a single non-optional catch-all arg (i.e. "[...slug]"), returns the name of the arg
+    STRICT_CATCHALL = re.compile(
+        rf"{_OPENING_BRACKET}{_DOT_DOT_DOT}({_ARG_NAME}){_CLOSING_BRACKET}"
+    )
+
+    # match a single optional catch-all arg (i.e. "[[...slug]]"), returns the name of the arg
+    OPTIONAL_CATCHALL = re.compile(
+        rf"{_OPENING_BRACKET * 2}{_DOT_DOT_DOT}({_ARG_NAME}){_CLOSING_BRACKET * 2}"
+    )
+
+    SPLAT_CATCHALL = "[[...splat]]"
     SINGLE_SEGMENT = "__SINGLE_SEGMENT__"
     DOUBLE_SEGMENT = "__DOUBLE_SEGMENT__"
-    SINGLE_CATCHALL_SEGMENT = "__SINGLE_CATCHALL_SEGMENT__"
     DOUBLE_CATCHALL_SEGMENT = "__DOUBLE_CATCHALL_SEGMENT__"
 
 

reflex/constants/state.py

@@ -13,3 +13,5 @@ class StateManagerMode(str, Enum):
 
 # Used for things like console_log, etc.
 FRONTEND_EVENT_STATE = "__reflex_internal_frontend_event_state"
+
+FIELD_MARKER = "_rx_state_"

reflex/custom_components/custom_components.py

@@ -461,20 +461,6 @@ def build():
     _run_build()
 
 
-@custom_components_cli.command(name="publish", deprecated=True)
-def publish():
-    """Publish a custom component. This command is deprecated and will be removed in future releases.
-
-    Raises:
-        Exit: If the publish command fails.
-    """
-    console.error(
-        "The publish command is deprecated. You can use `reflex component build` followed by `twine upload` or a similar publishing command to publish your custom component."
-        "\nIf you want to share your custom component with the Reflex community, please use `reflex component share`."
-    )
-    raise click.exceptions.Exit(code=1)
-
-
 def _collect_details_for_gallery():
     """Helper to collect details on the custom component to be included in the gallery.
 

reflex/environment.py

@@ -69,7 +69,7 @@ def interpret_boolean_env(value: str, field_name: str) -> bool:
         return True
     if value.lower() in false_values:
         return False
-    msg = f"Invalid boolean value: {value} for {field_name}"
+    msg = f"Invalid boolean value: {value!r} for {field_name}"
     raise EnvironmentVarValueError(msg)
 
 
@@ -89,7 +89,7 @@ def interpret_int_env(value: str, field_name: str) -> int:
     try:
         return int(value)
     except ValueError as ve:
-        msg = f"Invalid integer value: {value} for {field_name}"
+        msg = f"Invalid integer value: {value!r} for {field_name}"
         raise EnvironmentVarValueError(msg) from ve
 
 
@@ -108,7 +108,7 @@ def interpret_existing_path_env(value: str, field_name: str) -> ExistingPath:
     """
     path = Path(value)
     if not path.exists():
-        msg = f"Path does not exist: {path} for {field_name}"
+        msg = f"Path does not exist: {path!r} for {field_name}"
         raise EnvironmentVarValueError(msg)
     return path
 
@@ -143,7 +143,7 @@ def interpret_enum_env(value: str, field_type: GenericType, field_name: str) ->
     try:
         return field_type(value)
     except ValueError as ve:
-        msg = f"Invalid enum value: {value} for {field_name}"
+        msg = f"Invalid enum value: {value!r} for {field_name}"
         raise EnvironmentVarValueError(msg) from ve
 
 
@@ -169,6 +169,8 @@ def interpret_env_var_value(
         msg = f"Union types are not supported for environment variables: {field_name}."
         raise ValueError(msg)
 
+    value = value.strip()
+
     if field_type is bool:
         return interpret_boolean_env(value, field_name)
     if field_type is str:
@@ -475,7 +477,7 @@ class EnvironmentVariables:
     # Whether to use the system installed bun. If set to false, bun will be bundled with the app.
     REFLEX_USE_SYSTEM_BUN: EnvVar[bool] = env_var(False)
 
-    # The working directory for the next.js commands.
+    # The working directory for the frontend directory.
     REFLEX_WEB_WORKDIR: EnvVar[Path] = env_var(Path(constants.Dirs.WEB))
 
     # The working directory for the states directory.
@@ -604,3 +606,73 @@ class EnvironmentVariables:
 
 
 environment = EnvironmentVariables()
+
+try:
+    from dotenv import load_dotenv
+except ImportError:
+    load_dotenv = None
+
+
+def _paths_from_env_files(env_files: str) -> list[Path]:
+    """Convert a string of paths separated by os.pathsep into a list of Path objects.
+
+    Args:
+        env_files: The string of paths.
+
+    Returns:
+        A list of Path objects.
+    """
+    # load env files in reverse order
+    return list(
+        reversed(
+            [
+                Path(path)
+                for path_element in env_files.split(os.pathsep)
+                if (path := path_element.strip())
+            ]
+        )
+    )
+
+
+def _load_dotenv_from_files(files: list[Path]):
+    """Load environment variables from a list of files.
+
+    Args:
+        files: A list of Path objects representing the environment variable files.
+    """
+    from reflex.utils import console
+
+    if not files:
+        return
+
+    if load_dotenv is None:
+        console.error(
+            """The `python-dotenv` package is required to load environment variables from a file. Run `pip install "python-dotenv>=1.1.0"`."""
+        )
+        return
+
+    for env_file in files:
+        if env_file.exists():
+            load_dotenv(env_file, override=True)
+
+
+def _paths_from_environment() -> list[Path]:
+    """Get the paths from the REFLEX_ENV_FILE environment variable.
+
+    Returns:
+        A list of Path objects.
+    """
+    env_files = os.environ.get("REFLEX_ENV_FILE")
+    if not env_files:
+        return []
+
+    return _paths_from_env_files(env_files)
+
+
+def _load_dotenv_from_env():
+    """Load environment variables from paths specified in REFLEX_ENV_FILE."""
+    _load_dotenv_from_files(_paths_from_environment())
+
+
+# Load the env files at import time if they are set in the ENV_FILE environment variable.
+_load_dotenv_from_env()