litestar-vite 0.1.8__tar.gz → 0.1.9__tar.gz

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: litestar-vite
-Version: 0.1.8
+Version: 0.1.9
 Summary: Vite plugin for Litestar
 Project-URL: Changelog, https://cofin.github.io/litestar-vite/latest/changelog
 Project-URL: Discord, https://discord.gg/X3FJqy8d2j
@@ -55,7 +55,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from litestar import Controller, get
+from litestar import Controller, get, Litestar
 from litestar.response import Template
 from litestar.status_codes import HTTP_200_OK
 from litestar_vite import ViteConfig, VitePlugin
@@ -73,8 +73,8 @@ class WebController(Controller):
 vite = VitePlugin(
     config=ViteConfig(
         bundle_dir=Path("./public"),
-        resources_dir=Path("./resources"),
-        templates_dir=Path("./templates"),
+        resource_dir=Path("./resources"),
+        template_dir=Path("./templates"),
         # Should be False when in production
         dev_mode=True,
         hot_reload=True, # Websocket HMR asset reloading is enabled when true.
@@ -82,6 +82,7 @@ vite = VitePlugin(
 )
 app = Litestar(plugins=[vite], route_handlers=[WebController])
 
+
 ```
 
 Create a template to serve the application in `./templates/index.html.h2`:

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/README.md

@@ -18,7 +18,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
-from litestar import Controller, get
+from litestar import Controller, get, Litestar
 from litestar.response import Template
 from litestar.status_codes import HTTP_200_OK
 from litestar_vite import ViteConfig, VitePlugin
@@ -36,8 +36,8 @@ class WebController(Controller):
 vite = VitePlugin(
     config=ViteConfig(
         bundle_dir=Path("./public"),
-        resources_dir=Path("./resources"),
-        templates_dir=Path("./templates"),
+        resource_dir=Path("./resources"),
+        template_dir=Path("./templates"),
         # Should be False when in production
         dev_mode=True,
         hot_reload=True, # Websocket HMR asset reloading is enabled when true.
@@ -45,6 +45,7 @@ vite = VitePlugin(
 )
 app = Litestar(plugins=[vite], route_handlers=[WebController])
 
+
 ```
 
 Create a template to serve the application in `./templates/index.html.h2`:

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/examples/htmx/app.py

@@ -12,7 +12,7 @@ vite = VitePlugin(
     config=ViteConfig(
         bundle_dir=Path(here / "web" / "public"),
         resource_dir=Path(here / "web" / "resources"),
-        templates_dir=Path(here / "web" / "templates"),
+        template_dir=Path(here / "web" / "templates"),
         hot_reload=True,
     ),
 )

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/examples/react/app.py

@@ -12,7 +12,7 @@ vite = VitePlugin(
     config=ViteConfig(
         bundle_dir=Path(here / "web" / "public"),
         resource_dir=Path(here / "web" / "resources"),
-        templates_dir=Path(here / "web" / "templates"),
+        template_dir=Path(here / "web" / "templates"),
         hot_reload=True,
     ),
 )

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/examples/vue/app.py

@@ -13,7 +13,7 @@ vite = VitePlugin(
     config=ViteConfig(
         bundle_dir=Path(here / "web" / "public"),
         resource_dir=Path(here / "web" / "resources"),
-        templates_dir=Path(here / "web" / "templates"),
+        template_dir=Path(here / "web" / "templates"),
         hot_reload=True,
         port=3006,
     ),

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/litestar_vite/cli.py

@@ -38,13 +38,6 @@ def vite_group() -> None:
     default=None,
     required=False,
 )
-@option(
-    "--asset-path",
-    type=ClickPath(dir_okay=True, file_okay=False, path_type=Path),
-    help="The path to your Javascript/Typescript source and associated assets.  If this were a standalone Vue or React app, this would point to your `src/` folder.",
-    default=None,
-    required=False,
-)
 @option("--asset-url", type=str, help="Base url to serve assets from.", default=None, required=False)
 @option(
     "--vite-port",

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/litestar_vite/commands.py

@@ -76,7 +76,7 @@ def init_vite(
                     entry_point=entry_point,
                     enable_ssr=enable_ssr,
                     asset_url=asset_url,
-                    root_path=str(root_path.relative_to(Path.cwd())),
+                    root_path=str(root_path),
                     resource_path=str(resource_path.relative_to(root_path)),
                     bundle_path=str(bundle_path.relative_to(root_path)),
                     hot_file=str(hot_file.relative_to(root_path)),
@@ -116,11 +116,11 @@ async def _run_vite(command_to_run: str, app: Litestar) -> None:
 
     async def read_stdout(vite_process: Process) -> None:
         async for stdout in TextReceiveStream(vite_process.stdout):  # type: ignore[arg-type]
-            logger.info(stdout)
+            logger.info(stdout.replace("\n", ""))
 
     async def read_stderr(vite_process: Process) -> None:
         async for stdout in TextReceiveStream(vite_process.stderr):  # type: ignore[arg-type]
-            logger.warning(stdout)
+            logger.warning(stdout.replace("\n", ""))
 
     async with await open_process(command_to_run) as vite_process, create_task_group() as tg:
         tg.start_soon(read_stdout, vite_process)

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/litestar_vite/config.py

@@ -42,7 +42,7 @@ class ViteConfig:
 
     In a standalone Vue or React application, this would be equivalent to the ``./src`` directory.
     """
-    templates_dir: Path | str = field(default="templates")
+    template_dir: Path | str = field(default="templates")
     """Location of the Jinja2 template file.
     """
     manifest_name: str = ".vite/manifest.json"
@@ -92,10 +92,8 @@ class ViteConfig:
 
     def __post_init__(self) -> None:
         """Ensure that directory is set if engine is a class."""
-        if isinstance(self.root_dir, str):
+        if self.root_dir is not None and isinstance(self.root_dir, str):
             self.root_dir = Path(self.root_dir)
-        if self.root_dir is None:
-            self.root_dir = Path.cwd()
         if isinstance(self.resource_dir, str):
             self.resource_dir = Path(self.resource_dir)
         if isinstance(self.ssr_output_dir, str):

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/litestar_vite/plugin.py

@@ -45,7 +45,7 @@ class VitePlugin(InitPluginProtocol, CLIPlugin):
         app_config.template_config = ViteTemplateConfig(  # type: ignore[assignment]
             engine=ViteTemplateEngine,
             config=self._config,
-            directory=self._config.templates_dir,
+            directory=self._config.template_dir,
         )
         return app_config
 

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/litestar_vite/templates/init/vite.config.ts.j2

@@ -1,5 +1,4 @@
 import { defineConfig } from "vite";
-import path from "path";
 {% if include_vue %}import vue from "@vitejs/plugin-vue";{% endif %}
 {% if include_react %}import vue from "@vitejs/plugin-react";{% endif %}
 import litestar from "litestar-vite-plugin";
@@ -10,7 +9,7 @@ const VITE_PORT = process.env.VITE_PORT || "5173";
 const VITE_HOST = process.env.VITE_HOST || "localhost";
 export default defineConfig({
   base: `${ASSET_URL}`,
-  root: path.resolve(__dirname, "{{ root_path }}"),
+  root: "{{ root_path }}",
   server: {
     host: `${VITE_HOST}`,
     port: +`${VITE_PORT}`,
@@ -31,7 +30,7 @@ export default defineConfig({
   ],
   resolve: {
     alias: {
-      "@": path.resolve(__dirname, "{{ resource_path }}")
+      "@": "{{ resource_path }}"
     },
   },
 });

{litestar_vite-0.1.8 → litestar_vite-0.1.9}/pyproject.toml

@@ -33,7 +33,7 @@ license = {text = "MIT"}
 name = "litestar-vite"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.1.8"
+version = "0.1.9"
 
 [project.urls]
 Changelog = "https://cofin.github.io/litestar-vite/latest/changelog"