litestar-vite 0.10.0__py3-none-any.whl → 0.11.0__py3-none-any.whl

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/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.0",
     "@types/node": "^22.10.1",
 }
 DEFAULT_DEPENDENCIES: dict[str, str] = {"axios": "^1.7.2"}

litestar_vite/plugin.py

@@ -1,6 +1,8 @@
 from __future__ import annotations
 
 import os
+import signal
+import threading
 from contextlib import contextmanager
 from pathlib import Path
 from typing import TYPE_CHECKING, Iterator, cast
@@ -10,14 +12,14 @@ 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 +33,64 @@ 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: threading.Thread | None = None
+        self._lock = threading.Lock()
+
+    def start(self, command: list[str], cwd: Path | str | None) -> None:
+        """Start the Vite process."""
+        from litestar.cli._utils import console
+
+        from litestar_vite.commands import execute_command
+
+        try:
+            with self._lock:
+                if self.process and self.process.is_alive():
+                    return
+
+                self.process = threading.Thread(
+                    name="vite",
+                    target=execute_command,
+                    args=[],
+                    kwargs={"command_to_run": command, "cwd": cwd},
+                    daemon=True,  # Make thread daemon so it exits when main thread exits
+                )
+                console.print(f"Starting Vite process with command: {command}")
+                self.process.start()
+        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."""
+        from litestar.cli._utils import console
+
+        try:
+            with self._lock:
+                if self.process and self.process.is_alive():
+                    # Send SIGTERM to child process
+                    if hasattr(signal, "SIGTERM") and self.process.ident is not None:
+                        os.kill(self.process.ident, signal.SIGTERM)
+                    self.process.join(timeout=timeout)
+
+                    # Force kill if still alive
+                    if self.process.is_alive():
+                        if hasattr(signal, "SIGKILL") and self.process.ident is not None:
+                            os.kill(self.process.ident, signal.SIGKILL)
+                        self.process.join(timeout=1.0)
+                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 +99,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 +113,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 +130,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 +167,26 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
 
     @contextmanager
     def server_lifespan(self, app: Litestar) -> Iterator[None]:
-        import threading
-
+        """Manage Vite server process lifecycle."""
         from litestar.cli._utils import console
 
-        from litestar_vite.commands import execute_command
-
         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():

{litestar_vite-0.10.0.dist-info → litestar_vite-0.11.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.10.0
+Version: 0.11.0
 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.dist-info → litestar_vite-0.11.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 litestar_vite/__init__.py,sha256=OioNGhH88mdivQlFz9JlbJV8R6wyjSYE3c8C-RIM4Ls,277
 litestar_vite/__metadata__.py,sha256=_Wo-vNQuj5co9J4FwJAB2rRafbFo8ztTHrXmEPrYrV8,514
-litestar_vite/cli.py,sha256=iRJlHa72ch9IPtu88BsalrqzDGXI3F78b2ug8JT5UWA,10756
-litestar_vite/commands.py,sha256=gVs3SqPUz1z9KH2fhJ2BxUAYMqGUbqemRDMZXCw6_AA,5228
+litestar_vite/cli.py,sha256=CBSRohDLU9cDeKMAfSbFiw1x8OE_b15ZlUaxji9Rdw8,10749
+litestar_vite/commands.py,sha256=aGpSmrRfArSg4hkpL6GTuKZPRyZm1y-qhon0P5mUoEQ,5228
 litestar_vite/config.py,sha256=cZWIwTwNnBYScCty8OxxPaOL8cELx57dm7JQeV8og3Y,4565
 litestar_vite/loader.py,sha256=nrXL2txXoBZEsdLZnysgBYZSreMXQ7ckLuNcu7MqnSM,10277
-litestar_vite/plugin.py,sha256=EugRhABhxRI-VlFt5rRWNacV5OJiCbe7CgTn0QhPOQY,6064
+litestar_vite/plugin.py,sha256=XZ1RxyRS9aX3coJis02Uv2AMB2frI2eqKSlK_zZWwSY,8091
 litestar_vite/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 litestar_vite/inertia/__init__.py,sha256=Fab61KXbBnyub2Nx-2AHYv2U6QiYUIrqhEZia_f9xik,863
 litestar_vite/inertia/_utils.py,sha256=ijO9Lgka7ZPIAHkby9szbTGoSg0nDShC2bqWT9cDxi0,1956
@@ -23,7 +23,7 @@ litestar_vite/templates/package.json.j2,sha256=0JWgdTuaSZ25EmCltF_zbqDdpxfvCLeYu
 litestar_vite/templates/styles.css.j2,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 litestar_vite/templates/tsconfig.json.j2,sha256=q1REIuVyXUHCy4Zi2kgTkmrhdT98vyY89k-WTrImOj8,843
 litestar_vite/templates/vite.config.ts.j2,sha256=bF5kOPFafYMkhhV0VkIwetN-_zoVMGVM1jEMX_wKoNc,1037
-litestar_vite-0.10.0.dist-info/METADATA,sha256=lpAlb1pUY9VxlD8X6W73W5Di-x3Z7Y3H-pF2mfSCJfc,6222
-litestar_vite-0.10.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-litestar_vite-0.10.0.dist-info/licenses/LICENSE,sha256=HeTiEfEgvroUXZe_xAmYHxtTBgw--mbXyZLsWDYabHc,1069
-litestar_vite-0.10.0.dist-info/RECORD,,
+litestar_vite-0.11.0.dist-info/METADATA,sha256=vwSng0cRQYYu4oWOP7a0auIl2p7kLiaxUCOS3TT5fAA,6222
+litestar_vite-0.11.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+litestar_vite-0.11.0.dist-info/licenses/LICENSE,sha256=HeTiEfEgvroUXZe_xAmYHxtTBgw--mbXyZLsWDYabHc,1069
+litestar_vite-0.11.0.dist-info/RECORD,,