litestar-vite 0.10.0__tar.gz → 0.11.1__tar.gz

{litestar_vite-0.10.0 → litestar_vite-0.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.10.0
+Version: 0.11.1
 Summary: Vite plugin for Litestar
 Project-URL: Changelog, https://cofin.github.io/litestar-vite/latest/changelog
 Project-URL: Discord, https://discord.gg/X3FJqy8d2j

{litestar_vite-0.10.0 → litestar_vite-0.11.1}/pyproject.toml

@@ -25,7 +25,7 @@ license = { text = "MIT" }
 name = "litestar-vite"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.10.0"
+version = "0.11.1"
 
 [project.urls]
 Changelog = "https://cofin.github.io/litestar-vite/latest/changelog"
@@ -85,7 +85,7 @@ test = [
 allow_dirty = true
 commit = true
 commit_args = "--no-verify"
-current_version = "0.10.0"
+current_version = "0.11.1"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"

{litestar_vite-0.10.0 → litestar_vite-0.11.1}/src/py/litestar_vite/cli.py

@@ -113,8 +113,8 @@ def vite_init(
     )
     from rich.prompt import Confirm
 
+    from litestar_vite import VitePlugin
     from litestar_vite.commands import execute_command, init_vite
-    from litestar_vite.plugin import VitePlugin
 
     if callable(ctx.obj):
         ctx.obj = ctx.obj()

{litestar_vite-0.10.0 → litestar_vite-0.11.1}/src/py/litestar_vite/commands.py

@@ -14,7 +14,7 @@ DEFAULT_RESOURCES: set[str] = {"styles.css.j2", "main.ts.j2"}
 DEFAULT_DEV_DEPENDENCIES: dict[str, str] = {
     "typescript": "^5.7.2",
     "vite": "^6.0.3",
-    "litestar-vite-plugin": "^0.10.0",
+    "litestar-vite-plugin": "^0.11.1",
     "@types/node": "^22.10.1",
 }
 DEFAULT_DEPENDENCIES: dict[str, str] = {"axios": "^1.7.2"}

{litestar_vite-0.10.0 → litestar_vite-0.11.1}/src/py/litestar_vite/plugin.py

@@ -1,23 +1,28 @@
 from __future__ import annotations
 
 import os
+import platform
+import signal
+import subprocess
+import threading
 from contextlib import contextmanager
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterator, cast
 
+from litestar.cli._utils import console
 from litestar.contrib.jinja import JinjaTemplateEngine
 from litestar.exceptions import ImproperlyConfiguredException
 from litestar.plugins import CLIPlugin, InitPluginProtocol
 from litestar.static_files import create_static_files_router  # pyright: ignore[reportUnknownVariableType]
 
-from litestar_vite.config import ViteConfig
-from litestar_vite.loader import ViteAssetLoader, render_asset_tag, render_hmr_client
-
 if TYPE_CHECKING:
     from click import Group
     from litestar import Litestar
     from litestar.config.app import AppConfig
 
+    from litestar_vite.config import ViteConfig
+    from litestar_vite.loader import ViteAssetLoader
+
 
 def set_environment(config: ViteConfig) -> None:
     """Configure environment for easier integration"""
@@ -31,11 +36,57 @@ def set_environment(config: ViteConfig) -> None:
         os.environ.setdefault("VITE_DEV_MODE", str(config.dev_mode))
 
 
+class ViteProcess:
+    """Manages the Vite process."""
+
+    def __init__(self) -> None:
+        self.process: subprocess.Popen | None = None  # pyright: ignore[reportUnknownMemberType,reportMissingTypeArgument]
+        self._lock = threading.Lock()
+
+    def start(self, command: list[str], cwd: Path | str | None) -> None:
+        """Start the Vite process."""
+
+        try:
+            with self._lock:
+                if self.process and self.process.poll() is None:  # pyright: ignore[reportUnknownMemberType]
+                    return
+
+                console.print(f"Starting Vite process with command: {command}")
+                self.process = subprocess.Popen(
+                    command,
+                    cwd=cwd,
+                    shell=platform.system() == "Windows",
+                )
+        except Exception as e:
+            console.print(f"[red]Failed to start Vite process: {e!s}[/]")
+            raise
+
+    def stop(self, timeout: float = 5.0) -> None:
+        """Stop the Vite process."""
+
+        try:
+            with self._lock:
+                if self.process and self.process.poll() is None:  # pyright: ignore[reportUnknownMemberType]
+                    # Send SIGTERM to child process
+                    if hasattr(signal, "SIGTERM"):
+                        self.process.terminate()  # pyright: ignore[reportUnknownMemberType]
+                    try:
+                        self.process.wait(timeout=timeout)  # pyright: ignore[reportUnknownMemberType]
+                    except subprocess.TimeoutExpired:
+                        # Force kill if still alive
+                        if hasattr(signal, "SIGKILL"):
+                            self.process.kill()  # pyright: ignore[reportUnknownMemberType]
+                        self.process.wait(timeout=1.0)  # pyright: ignore[reportUnknownMemberType]
+                console.print("Stopping Vite process")
+        except Exception as e:
+            console.print(f"[red]Failed to stop Vite process: {e!s}[/]")
+            raise
+
+
 class VitePlugin(InitPluginProtocol, CLIPlugin):
     """Vite plugin."""
 
-    __slots__ = ("_asset_loader", "_config")
-    _asset_loader: ViteAssetLoader | None
+    __slots__ = ("_asset_loader", "_config", "_vite_process")
 
     def __init__(self, config: ViteConfig | None = None, asset_loader: ViteAssetLoader | None = None) -> None:
         """Initialize ``Vite``.
@@ -44,10 +95,13 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
             config: configuration to use for starting Vite.  The default configuration will be used if it is not provided.
             asset_loader: an initialized asset loader to use for rendering asset tags.
         """
+        from litestar_vite.config import ViteConfig
+
         if config is None:
             config = ViteConfig()
         self._config = config
         self._asset_loader = asset_loader
+        self._vite_process = ViteProcess()
 
     @property
     def config(self) -> ViteConfig:
@@ -55,6 +109,8 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
 
     @property
     def asset_loader(self) -> ViteAssetLoader:
+        from litestar_vite.loader import ViteAssetLoader
+
         if self._asset_loader is None:
             self._asset_loader = ViteAssetLoader.initialize_loader(config=self._config)
         return self._asset_loader
@@ -70,6 +126,8 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
         Args:
             app_config: The :class:`AppConfig <litestar.config.app.AppConfig>` instance.
         """
+        from litestar_vite.loader import render_asset_tag, render_hmr_client
+
         if app_config.template_config is None:  # pyright: ignore[reportUnknownMemberType]
             msg = "A template configuration is required for Vite."
             raise ImproperlyConfiguredException(msg)
@@ -105,34 +163,25 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
 
     @contextmanager
     def server_lifespan(self, app: Litestar) -> Iterator[None]:
-        import threading
-
-        from litestar.cli._utils import console
-
-        from litestar_vite.commands import execute_command
+        """Manage Vite server process lifecycle."""
 
         if self._config.use_server_lifespan and self._config.dev_mode:
             command_to_run = self._config.run_command if self._config.hot_reload else self._config.build_watch_command
+
             if self.config.hot_reload:
                 console.rule("[yellow]Starting Vite process with HMR Enabled[/]", align="left")
             else:
                 console.rule("[yellow]Starting Vite watch and build process[/]", align="left")
+
             if self._config.set_environment:
                 set_environment(config=self._config)
-            vite_thread = threading.Thread(
-                name="vite",
-                target=execute_command,
-                args=[],
-                kwargs={"command_to_run": command_to_run, "cwd": self._config.root_dir},
-            )
+
             try:
-                vite_thread.start()
+                self._vite_process.start(command_to_run, self._config.root_dir)
                 yield
             finally:
-                if vite_thread.is_alive():
-                    vite_thread.join(timeout=5)
+                self._vite_process.stop()
                 console.print("[yellow]Vite process stopped.[/]")
-
         else:
             manifest_path = Path(f"{self._config.bundle_dir}/{self._config.manifest_name}")
             if manifest_path.exists():