litestar-vite 0.8.1__tar.gz → 0.8.2__tar.gz

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/.gitignore

@@ -25,6 +25,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+tmp/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.8.1
+Version: 0.8.2
 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.8.1 → litestar_vite-0.8.2}/pyproject.toml

@@ -25,7 +25,7 @@ license = { text = "MIT" }
 name = "litestar-vite"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.8.1"
+version = "0.8.2"
 
 [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.8.1"
+current_version = "0.8.2"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"
@@ -130,6 +130,7 @@ search = """
   "name": "litestar-vite-plugin",
   "version": "{current_version}",
 """
+
 [[tool.bumpversion.files]]
 filename = "package-lock.json"
 replace = """
@@ -141,6 +142,11 @@ search = """
       "version": "{current_version}",
 """
 
+[[tool.bumpversion.files]]
+filename = "src/py/litestar_vite/commands.py"
+replace = '    "litestar-vite-plugin": "^{new_version}",'
+search = '    "litestar-vite-plugin": "^{current_version}",'
+
 [tool.pytest.ini_options]
 addopts = "--dist loadfile -n auto"
 filterwarnings = ["ignore::DeprecationWarning:pkg_resources.*"]

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/litestar_vite/cli.py

@@ -125,6 +125,7 @@ def vite_init(
     config = plugin._config  # pyright: ignore[reportPrivateUsage]
 
     console.rule("[yellow]Initializing Vite[/]", align="left")
+    root_path = Path(root_path or config.root_dir or Path.cwd())
     resource_path = Path(resource_path or config.resource_dir)
     public_path = Path(public_path or config.public_dir)
     bundle_path = Path(bundle_path or config.bundle_dir)
@@ -132,7 +133,6 @@ def vite_init(
     asset_url = asset_url or config.asset_url
     vite_port = vite_port or config.port
     hot_file = Path(bundle_path / config.hot_file)
-    root_path = Path(root_path or config.root_dir or resource_path.parent)
 
     if any(output_path.exists() for output_path in (bundle_path, resource_path)) and not any(
         [overwrite, no_prompt],
@@ -143,10 +143,6 @@ def vite_init(
         if not confirm_overwrite:
             console.print("Skipping Vite initialization")
             sys.exit(2)
-    for output_path in (bundle_path, resource_path, root_path):
-        if output_path.exists():
-            console.print(f" * Creating {output_path!s}")
-        output_path.mkdir(parents=True, exist_ok=True)
 
     enable_ssr = (
         True

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/litestar_vite/commands.py

@@ -12,10 +12,10 @@ if TYPE_CHECKING:
 VITE_INIT_TEMPLATES: set[str] = {"package.json.j2", "tsconfig.json.j2", "vite.config.ts.j2"}
 DEFAULT_RESOURCES: set[str] = {"styles.css.j2", "main.ts.j2"}
 DEFAULT_DEV_DEPENDENCIES: dict[str, str] = {
-    "typescript": "^5.3.3",
-    "vite": "^5.3.3",
-    "litestar-vite-plugin": "^0.6.2",
-    "@types/node": "^20.14.10",
+    "typescript": "^5.7.2",
+    "vite": "^6.0.3",
+    "litestar-vite-plugin": "^0.8.2",
+    "@types/node": "^22.10.1",
 }
 DEFAULT_DEPENDENCIES: dict[str, str] = {"axios": "^1.7.2"}
 
@@ -78,10 +78,14 @@ def init_vite(
         template_name: get_template(environment=vite_template_env, name=template_name)
         for template_name in enabled_templates
     }
+
+    # Prepare root_path
+    root_path.mkdir(parents=True, exist_ok=True)
     for template_name, template in templates.items():
         target_file_name = template_name[:-3] if template_name.endswith(".j2") else template_name
-        with Path(target_file_name).open(mode="w") as file:
-            console.print(f" * Writing {target_file_name} to {Path(target_file_name)!s}")
+        target_file_path = root_path / target_file_name
+        with target_file_path.open(mode="w") as file:
+            console.print(f" * Writing {target_file_name} to {target_file_path!s}")
 
             file.write(
                 template.render(
@@ -92,10 +96,10 @@ def init_vite(
                     enable_ssr=enable_ssr,
                     asset_url=asset_url,
                     root_path=root_path,
-                    resource_path=str(resource_path.relative_to(root_path)),
-                    public_path=str(public_path.relative_to(root_path)),
-                    bundle_path=str(bundle_path.relative_to(root_path)),
-                    hot_file=str(hot_file.relative_to(root_path)),
+                    resource_path=str(resource_path),
+                    public_path=str(public_path),
+                    bundle_path=str(bundle_path),
+                    hot_file=str(hot_file),
                     vite_port=str(vite_port),
                     litestar_port=litestar_port,
                     dependencies=to_json(dependencies),
@@ -103,12 +107,16 @@ def init_vite(
                 ),
             )
 
+    (root_path / bundle_path).mkdir(parents=True, exist_ok=True)
+    (root_path / public_path).mkdir(parents=True, exist_ok=True)
+    (root_path / resource_path).mkdir(parents=True, exist_ok=True)
     for resource_name in enabled_resources:
         template = get_template(environment=vite_template_env, name=resource_name)
-        target_file_name = f"{resource_path}/{resource_name[:-3] if resource_name.endswith('.j2') else resource_name}"
-        with Path(target_file_name).open(mode="w") as file:
+        target_file_name = f"{resource_name[:-3] if resource_name.endswith('.j2') else resource_name}"
+        target_file_path = root_path / resource_path / target_file_name
+        with target_file_path.open(mode="w") as file:
             console.print(
-                f" * Writing {resource_name[:-3] if resource_name.endswith('.j2') else resource_name} to {Path(target_file_name)!s}",
+                f" * Writing {resource_name[:-3] if resource_name.endswith('.j2') else resource_name} to {target_file_path!s}",
             )
             file.write(template.render())
     console.print("[yellow]Vite initialization completed.[/]")

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/litestar_vite/config.py

@@ -111,6 +111,8 @@ class ViteConfig:
         """Ensure that directory is set if engine is a class."""
         if self.root_dir is not None and isinstance(self.root_dir, str):
             self.root_dir = Path(self.root_dir)
+        elif self.root_dir is None:
+            self.root_dir = Path()
         if self.template_dir is not None and isinstance(self.template_dir, str):
             self.template_dir = Path(self.template_dir)
         if self.public_dir and isinstance(self.public_dir, str):

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/litestar_vite/templates/vite.config.ts.j2

@@ -8,7 +8,6 @@ const VITE_PORT = process.env.VITE_PORT || "5173";
 const VITE_HOST = process.env.VITE_HOST || "localhost";
 export default defineConfig({
   base: `${ASSET_URL}`,
-  {% if root_path and root_path != '.' %} root: "{{ root_path }}",{% endif %}
   server: {
     host: "0.0.0.0",
     port: +`${VITE_PORT}`,

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/tests/test_cli/test_init.py

@@ -74,15 +74,25 @@ app = Litestar(plugins=[vite])
     app_file = create_app_file("command_test_app.py", content=app_file_content)
     result = runner.invoke(
         root_command,
-        ["--app-dir", f"{app_file.parent!s}", "--app", f"{app_file.stem}:app", "assets", "init", "--no-prompt"],
+        [
+            "--app-dir",
+            f"{app_file.parent!s}",
+            "--app",
+            f"{app_file.stem}:app",
+            "assets",
+            "init",
+            "--no-prompt",
+            "--root-path",
+            "web",
+        ],
     )
 
     assert "Initializing Vite" in result.output
-    assert Path(Path(tmp_project_dir) / "vite.config.ts").exists()
-    assert Path(Path(tmp_project_dir) / "package.json").exists()
-    assert Path(Path(tmp_project_dir) / "tsconfig.json").exists()
-    assert Path(Path(tmp_project_dir) / "resources" / "main.ts").exists()
-    assert Path(Path(tmp_project_dir) / "resources" / "styles.css").exists()
+    assert Path(Path(tmp_project_dir) / "web" / "vite.config.ts").exists()
+    assert Path(Path(tmp_project_dir) / "web" / "package.json").exists()
+    assert Path(Path(tmp_project_dir) / "web" / "tsconfig.json").exists()
+    assert Path(Path(tmp_project_dir) / "web" / "resources" / "main.ts").exists()
+    assert Path(Path(tmp_project_dir) / "web" / "resources" / "styles.css").exists()
 
 
 def test_init_install_build(

{litestar_vite-0.8.1 → litestar_vite-0.8.2}/src/py/tests/test_config.py

@@ -1,4 +1,4 @@
-from pathlib import Path
+from pathlib import Path, PosixPath
 
 from litestar_vite.config import ViteConfig
 
@@ -9,4 +9,5 @@ def test_default_vite_config() -> None:
     assert isinstance(config.public_dir, Path)
     assert config.ssr_output_dir is None
     assert isinstance(config.resource_dir, Path)
-    assert config.root_dir is None
+    assert isinstance(config.root_dir, (Path, PosixPath))
+    assert config.root_dir == PosixPath(".")