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

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

litestar_vite/plugin.py

@@ -1,12 +1,15 @@
 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
@@ -37,50 +40,43 @@ class ViteProcess:
     """Manages the Vite process."""
 
     def __init__(self) -> None:
-        self.process: threading.Thread | None = 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."""
-        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():
+                if self.process and self.process.poll() is None:  # pyright: ignore[reportUnknownMemberType]
                     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()
+                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."""
-        from litestar.cli._utils import console
 
         try:
             with self._lock:
-                if self.process and self.process.is_alive():
+                if self.process and self.process.poll() is None:  # pyright: ignore[reportUnknownMemberType]
                     # 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)
+                    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}[/]")
@@ -168,7 +164,6 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
     @contextmanager
     def server_lifespan(self, app: Litestar) -> Iterator[None]:
         """Manage Vite server process lifecycle."""
-        from litestar.cli._utils import console
 
         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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.11.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.11.0.dist-info → litestar_vite-0.11.1.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=CBSRohDLU9cDeKMAfSbFiw1x8OE_b15ZlUaxji9Rdw8,10749
-litestar_vite/commands.py,sha256=aGpSmrRfArSg4hkpL6GTuKZPRyZm1y-qhon0P5mUoEQ,5228
+litestar_vite/commands.py,sha256=E-PaU7Hk9BDj63d8u7-FSwR8oH9hfSB41BGOpmVuv3o,5228
 litestar_vite/config.py,sha256=cZWIwTwNnBYScCty8OxxPaOL8cELx57dm7JQeV8og3Y,4565
 litestar_vite/loader.py,sha256=nrXL2txXoBZEsdLZnysgBYZSreMXQ7ckLuNcu7MqnSM,10277
-litestar_vite/plugin.py,sha256=XZ1RxyRS9aX3coJis02Uv2AMB2frI2eqKSlK_zZWwSY,8091
+litestar_vite/plugin.py,sha256=2ypzvlW5TaOeXTWPa2yHXzkPUf4okRBDl9YHo2qg-cM,8043
 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.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,,
+litestar_vite-0.11.1.dist-info/METADATA,sha256=_qb3u3hyEBieCsfpMOPNBSjCPRfX8JH9tt0UyJOxh5Y,6222
+litestar_vite-0.11.1.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+litestar_vite-0.11.1.dist-info/licenses/LICENSE,sha256=HeTiEfEgvroUXZe_xAmYHxtTBgw--mbXyZLsWDYabHc,1069
+litestar_vite-0.11.1.dist-info/RECORD,,