Revert "feat(vite): auto-load templates + Template helper + config flag"

example/vite-app/bootstrap/application.py

@@ -4,15 +4,14 @@
 from fastapi_startkit.logging import LogProvider
 from fastapi_startkit.vite import ViteProvider
 
+# from config.vite import ViteConfig
 from providers.fastapi_provider import FastAPIProvider
 
 app: Application = Application(
     base_path=Path(__file__).resolve().parent.parent,
     providers=[
         LogProvider,
         FastAPIProvider,
-        # ViteProvider auto-binds a Jinja2Templates engine (with the vite()
-        # globals injected) at the configured templates directory.
-        (ViteProvider, {"templates_directory": "templates"}),
+        ViteProvider,
     ],
 )

example/vite-app/providers/fastapi_provider.py

@@ -1,4 +1,7 @@
+from pathlib import Path
+
 from fastapi import FastAPI
+from starlette.templating import Jinja2Templates
 
 from fastapi_startkit.fastapi import FastAPIProvider as BaseFastAPIProvider
 
@@ -11,6 +14,11 @@ def register(self) -> None:
         )
         self.app.use_fastapi(fastapi)
 
+        # Bind Jinja2Templates so ViteProvider can inject vite() globals into it.
+        templates_dir = Path(self.app.base_path) / "templates"
+        templates = Jinja2Templates(directory=str(templates_dir))
+        self.app.bind("templates", templates)
+
     def boot(self) -> None:
         super().boot()
 

example/vite-app/routes/web.py

@@ -1,14 +1,15 @@
-from fastapi import APIRouter
+from fastapi import APIRouter, Request
 from fastapi.responses import HTMLResponse
 
-from fastapi_startkit.vite import template
-
 web = APIRouter()
 
 
 @web.get("/", response_class=HTMLResponse)
-async def index():
-    return template("index.html")
+async def index(request: Request):
+    from bootstrap.application import app
+
+    templates = app.make("templates")
+    return templates.TemplateResponse(request, "index.html")
 
 
 @web.get("/api/health")

fastapi_startkit/src/fastapi_startkit/fastapi/providers/fastapi_provider.py

@@ -24,11 +24,8 @@ def register(self) -> None:
     def boot(self):
         import os
 
-        from fastapi_startkit.fastapi.middleware import RequestContextMiddleware
-
         self.commands([ServeCommand])
         self._register_exception_handlers()
-        self.app.add_middleware(RequestContextMiddleware)
 
         source = os.path.abspath(os.path.join(os.path.dirname(__file__), "../config/fastapi.py"))
         self.publishes({source: "config/fastapi.py"})

fastapi_startkit/src/fastapi_startkit/vite/__init__.py

@@ -1,13 +1,10 @@
 from .vite import Vite
 from .providers.provider import ViteProvider
-from .template import Template, template
 from .exceptions import ViteException, ViteManifestNotFoundException
 
 __all__ = [
     "Vite",
     "ViteProvider",
-    "Template",
-    "template",
     "ViteException",
     "ViteManifestNotFoundException",
 ]

fastapi_startkit/src/fastapi_startkit/vite/config/vite.py

@@ -10,5 +10,3 @@ class ViteConfig:
     asset_url: str = ""
     static_url: str = "/build"
     mount_static: bool = True
-    template: bool = True
-    templates_directory: str = "resources/templates"

fastapi_startkit/src/fastapi_startkit/vite/providers/provider.py

@@ -28,25 +28,6 @@ def register(self) -> None:
 
         self.app.bind("vite", vite)
 
-        self.register_templates(config)
-
-    def register_templates(self, config: ViteConfig) -> None:
-        # Provide a template engine out of the box so fresh apps can render
-        # views and have the vite() globals injected during boot. An existing
-        # binding always wins, keeping this backward-compatible.
-        if not config.template or self.app.has("templates"):
-            return
-
-        try:
-            from starlette.templating import Jinja2Templates
-        except ImportError as exc:
-            raise ImportError(
-                "Rendering templates requires Jinja2. Install it with: pip install fastapi-startkit[vite]"
-            ) from exc
-
-        templates_dir = self.app.base_path / config.templates_directory
-        self.app.bind("templates", Jinja2Templates(directory=str(templates_dir)))
-
     def boot(self) -> None:
         vite: Vite = self.app.make("vite")
         config = self.app.make("config").get(self.provider_key)