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

reflex/plugins/tailwind_v4.py

@@ -1,123 +1,44 @@
 """Base class for all plugins."""
 
+import dataclasses
 from pathlib import Path
 from types import SimpleNamespace
 
 from reflex.constants.base import Dirs
 from reflex.constants.compiler import Ext, PageNames
-from reflex.plugins.base import Plugin as PluginBase
-from reflex.utils.decorator import once
+from reflex.plugins.shared_tailwind import (
+    TailwindConfig,
+    TailwindPlugin,
+    tailwind_config_js_template,
+)
 
 
 class Constants(SimpleNamespace):
     """Tailwind constants."""
 
     # The Tailwindcss version
-    VERSION = "tailwindcss@4.1.7"
+    VERSION = "tailwindcss@4.1.8"
     # The Tailwind config.
     CONFIG = "tailwind.config.js"
     # Default Tailwind content paths
-    CONTENT = ["./pages/**/*.{js,ts,jsx,tsx}", "./utils/**/*.{js,ts,jsx,tsx}"]
+    CONTENT = [f"./{Dirs.PAGES}/**/*.{{js,ts,jsx,tsx}}", "./utils/**/*.{js,ts,jsx,tsx}"]
     # Relative tailwind style path to root stylesheet in Dirs.STYLES.
     ROOT_STYLE_PATH = "./tailwind.css"
 
     # Content of the style content.
     ROOT_STYLE_CONTENT = """@layer theme, base, components, utilities;
-@config "../tailwind.config.js";
 @import "tailwindcss/theme.css" layer(theme);
 @import "tailwindcss/preflight.css" layer(base);
 @import "{radix_url}" layer(components);
 @import "tailwindcss/utilities.css" layer(utilities);
+@config "../tailwind.config.js";
 """
 
     # The default tailwind css.
     TAILWIND_CSS = "@import url('./tailwind.css');"
 
 
-@once
-def tailwind_config_js_template():
-    """Get the Tailwind config template.
-
-    Returns:
-        The Tailwind config template.
-    """
-    from reflex.compiler.templates import from_string
-
-    source = r"""
-{# Helper macro to render JS objects and arrays #}
-{% macro render_js(val, indent=2, level=0) -%}
-{%- set space = ' ' * (indent * level) -%}
-{%- set next_space = ' ' * (indent * (level + 1)) -%}
-
-{%- if val is mapping -%}
-{
-{%- for k, v in val.items() %}
-{{ next_space }}{{ k if k is string and k.isidentifier() else k|tojson }}: {{ render_js(v, indent, level + 1) }}{{ "," if not loop.last }}
-{%- endfor %}
-{{ space }}}
-{%- elif val is iterable and val is not string -%}
-[
-{%- for item in val %}
-{{ next_space }}{{ render_js(item, indent, level + 1) }}{{ "," if not loop.last }}
-{%- endfor %}
-{{ space }}]
-{%- else -%}
-{{ val | tojson }}
-{%- endif -%}
-{%- endmacro %}
-
-{# Extract destructured imports from plugin dicts only #}
-{%- set imports = [] %}
-{%- for plugin in plugins if plugin is mapping and plugin.import is defined %}
-  {%- set _ = imports.append(plugin.import) %}
-{%- endfor %}
-
-/** @type {import('tailwindcss').Config} */
-{%- for imp in imports %}
-const { {{ imp.name }} } = require({{ imp.from | tojson }});
-{%- endfor %}
-
-module.exports = {
-  content: {{ render_js(content) }},
-  theme: {{ render_js(theme) }},
-  {% if darkMode is defined %}darkMode: {{ darkMode | tojson }},{% endif %}
-  {% if corePlugins is defined %}corePlugins: {{ render_js(corePlugins) }},{% endif %}
-  {% if important is defined %}important: {{ important | tojson }},{% endif %}
-  {% if prefix is defined %}prefix: {{ prefix | tojson }},{% endif %}
-  {% if separator is defined %}separator: {{ separator | tojson }},{% endif %}
-  {% if presets is defined %}
-  presets: [
-    {% for preset in presets %}
-    require({{ preset | tojson }}){{ "," if not loop.last }}
-    {% endfor %}
-  ],
-  {% endif %}
-  plugins: [
-    {% for plugin in plugins %}
-      {% if plugin is mapping %}
-        {% if plugin.call is defined %}
-          {{ plugin.call }}(
-            {%- if plugin.args is defined -%}
-              {{ render_js(plugin.args) }}
-            {%- endif -%}
-          ){{ "," if not loop.last }}
-        {% else %}
-          require({{ plugin.name | tojson }}){{ "," if not loop.last }}
-        {% endif %}
-      {% else %}
-        require({{ plugin | tojson }}){{ "," if not loop.last }}
-      {% endif %}
-    {% endfor %}
-  ]
-};
-"""
-
-    return from_string(source)
-
-
-def compile_config(
-    config: dict,
-):
+def compile_config(config: TailwindConfig):
     """Compile the Tailwind config.
 
     Args:
@@ -128,6 +49,7 @@ def compile_config(
     """
     return Constants.CONFIG, tailwind_config_js_template().render(
         **config,
+        DEFAULT_CONTENT=Constants.CONTENT,
     )
 
 
@@ -218,7 +140,8 @@ def add_tailwind_to_css_file(css_file_content: str) -> str:
     )
 
 
-class Plugin(PluginBase):
+@dataclasses.dataclass
+class TailwindV4Plugin(TailwindPlugin):
     """Plugin for Tailwind CSS."""
 
     def get_frontend_development_dependencies(self, **context) -> list[str]:
@@ -230,12 +153,9 @@ class Plugin(PluginBase):
         Returns:
             A list of packages required by the plugin.
         """
-        from reflex.config import get_config
-
-        config = get_config()
         return [
             plugin if isinstance(plugin, str) else plugin.get("name")
-            for plugin in (config.tailwind or {}).get("plugins", [])
+            for plugin in self.get_config().get("plugins", [])
         ] + [Constants.VERSION, "@tailwindcss/postcss@4.1.7"]
 
     def pre_compile(self, **context):
@@ -244,23 +164,10 @@ class Plugin(PluginBase):
         Args:
             context: The context for the plugin.
         """
-        from reflex.config import get_config
-
-        config = get_config().tailwind or {}
-
-        config["content"] = config.get("content", Constants.CONTENT)
-        context["add_save_task"](compile_config, config)
+        context["add_save_task"](compile_config, self.get_config())
         context["add_save_task"](compile_root_style)
         context["add_modify_task"](Dirs.POSTCSS_JS, add_tailwind_to_postcss_config)
         context["add_modify_task"](
             str(Path(Dirs.STYLES) / (PageNames.STYLESHEET_ROOT + Ext.CSS)),
             add_tailwind_to_css_file,
         )
-
-    def __repr__(self):
-        """Return a string representation of the plugin.
-
-        Returns:
-            A string representation of the plugin.
-        """
-        return "TailwindV4Plugin()"

reflex/reflex.py

@@ -204,6 +204,7 @@ def _run(
     args = (frontend,)
     kwargs = {
         "check_if_schema_up_to_date": True,
+        "prerender_routes": env == constants.Env.PROD,
     }
 
     # Granian fails if the app is already imported.

reflex/route.py

@@ -17,14 +17,13 @@ def verify_route_validity(route: str) -> None:
         ValueError: If the route is invalid.
     """
     pattern = catchall_in_route(route)
-    if pattern and not route.endswith(pattern):
-        msg = f"Catch-all must be the last part of the URL: {route}"
-        raise ValueError(msg)
-    if route == "api" or route.startswith("api/"):
-        msg = (
-            f"Cannot have a route prefixed with 'api/': {route} (conflicts with NextJS)"
-        )
-        raise ValueError(msg)
+    if pattern:
+        if pattern != "[[...splat]]":
+            msg = f"Catchall pattern `{pattern}` is not valid. Only `[[...splat]]` is allowed."
+            raise ValueError(msg)
+        if not route.endswith(pattern):
+            msg = f"Catchall pattern `{pattern}` must be at the end of the route."
+            raise ValueError(msg)
 
 
 def get_route_args(route: str) -> dict[str, str]:
@@ -81,6 +80,14 @@ def get_route_args(route: str) -> dict[str, str]:
 def catchall_in_route(route: str) -> str:
     """Extract the catchall part from a route.
 
+    Example:
+        >>> catchall_in_route("/posts/[...slug]")
+        '[...slug]'
+        >>> catchall_in_route("/posts/[[...slug]]")
+        '[[...slug]]'
+        >>> catchall_in_route("/posts/[slug]")
+        ''
+
     Args:
         route: the route from which to extract
 
@@ -91,19 +98,6 @@ def catchall_in_route(route: str) -> str:
     return match_.group() if match_ else ""
 
 
-def catchall_prefix(route: str) -> str:
-    """Extract the prefix part from a route that contains a catchall.
-
-    Args:
-        route: the route from which to extract
-
-    Returns:
-        str: the prefix part of the URI
-    """
-    pattern = catchall_in_route(route)
-    return route.replace(pattern, "") if pattern else ""
-
-
 def replace_brackets_with_keywords(input_string: str) -> str:
     """Replace brackets and everything inside it in a string with a keyword.