From c26d626bf22d573ffb8ac52cd3072db897b64def Mon Sep 17 00:00:00 2001 From: Benedikt Bartscher Date: Mon, 5 Aug 2024 21:57:30 +0200 Subject: [PATCH] Revert "move state.js to jinja, related to #3738" This reverts commit 4d2a72c4e86be3c8466cc701daf173ea70cba90d. --- .../state.js.jinja2 => web/utils/state.js} | 4 ++-- reflex/compiler/compiler.py | 21 ------------------- reflex/compiler/templates.py | 11 ---------- reflex/compiler/utils.py | 9 -------- reflex/constants/base.py | 2 -- 5 files changed, 2 insertions(+), 45 deletions(-) rename reflex/.templates/{jinja/web/utils/state.js.jinja2 => web/utils/state.js} (99%) diff --git a/reflex/.templates/jinja/web/utils/state.js.jinja2 b/reflex/.templates/web/utils/state.js similarity index 99% rename from reflex/.templates/jinja/web/utils/state.js.jinja2 rename to reflex/.templates/web/utils/state.js index ef92ba35af..da0934da56 100644 --- a/reflex/.templates/jinja/web/utils/state.js.jinja2 +++ b/reflex/.templates/web/utils/state.js @@ -810,7 +810,7 @@ export const useEventLoop = ( const vars = {}; vars[storage_to_state_map[e.key]] = e.newValue; const event = Event( - `${state_name}.{{ const.update_vars_internal }}`, + `${state_name}.{{ update_vars_internal }}`, { vars: vars } ); addEvents([event], e); @@ -824,7 +824,7 @@ export const useEventLoop = ( // Route after the initial page hydration. useEffect(() => { const change_start = () => { - const main_state_dispatch = dispatch["{{ const.state_name }}"]; + const main_state_dispatch = dispatch["state"]; if (main_state_dispatch !== undefined) { main_state_dispatch({ is_hydrated: false }); } diff --git a/reflex/compiler/compiler.py b/reflex/compiler/compiler.py index 998b6fc8bd..4122a0938a 100644 --- a/reflex/compiler/compiler.py +++ b/reflex/compiler/compiler.py @@ -126,15 +126,6 @@ def _compile_contexts(state: Optional[Type[BaseState]], theme: Component | None) ) -def _compile_state() -> str: - """Compile the state. - - Returns: - The compiled state. - """ - return templates.state().render() - - def _compile_page( component: BaseComponent, state: Type[BaseState] | None, @@ -433,18 +424,6 @@ def compile_contexts( return output_path, _compile_contexts(state, theme) -def compile_state() -> tuple[str, str]: - """Compile the state. - - Returns: - The path and code of the compiled state. - """ - output_path = utils.get_state_path() - - code = _compile_state() - return output_path, code - - def compile_page( path: str, component: BaseComponent, state: Type[BaseState] | None ) -> tuple[str, str]: diff --git a/reflex/compiler/templates.py b/reflex/compiler/templates.py index aa7628bb87..debb20a3d2 100644 --- a/reflex/compiler/templates.py +++ b/reflex/compiler/templates.py @@ -14,7 +14,6 @@ def __init__(self) -> None: from reflex.state import ( FrontendEventExceptionState, OnLoadInternalState, - State, UpdateVarsInternalState, ) @@ -49,7 +48,6 @@ def __init__(self) -> None: "set_color_mode": constants.ColorMode.SET, "use_color_mode": constants.ColorMode.USE, "hydrate": constants.CompileVars.HYDRATE, - "state_name": State.get_name(), "on_load_internal": f"{OnLoadInternalState.get_name()}.on_load_internal", "update_vars_internal": f"{UpdateVarsInternalState.get_name()}.update_vars_internal", "frontend_exception_state": FrontendEventExceptionState.get_full_name(), @@ -113,15 +111,6 @@ def context(): return get_template("web/utils/context.js.jinja2") -def state(): - """Template for the state file. - - Returns: - Template: The template for the state file. - """ - return get_template("web/utils/state.js.jinja2") - - def tailwind_config(): """Template for Tailwind config. diff --git a/reflex/compiler/utils.py b/reflex/compiler/utils.py index ad6933e632..29398da87d 100644 --- a/reflex/compiler/utils.py +++ b/reflex/compiler/utils.py @@ -399,15 +399,6 @@ def get_context_path() -> str: return str(get_web_dir() / (constants.Dirs.CONTEXTS_PATH + constants.Ext.JS)) -def get_state_path() -> str: - """Get the path of the state file. - - Returns: - The path of the state module. - """ - return str(get_web_dir() / (constants.Dirs.STATES_PATH + constants.Ext.JS)) - - def get_components_path() -> str: """Get the path of the compiled components. diff --git a/reflex/constants/base.py b/reflex/constants/base.py index 2a1db1ac28..6ec73cdf0e 100644 --- a/reflex/constants/base.py +++ b/reflex/constants/base.py @@ -35,8 +35,6 @@ class Dirs(SimpleNamespace): COMPONENTS_PATH = "/".join([UTILS, "components"]) # The name of the contexts file. CONTEXTS_PATH = "/".join([UTILS, "context"]) - # The name of the states file. - STATES_PATH = "/".join([UTILS, "state"]) # The name of the output static directory. STATIC = "_static" # The name of the public html directory served at "/"