litestar-vite 0.1.20__tar.gz → 0.1.22__tar.gz

{litestar_vite-0.1.20 → litestar_vite-0.1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.1.20
+Version: 0.1.22
 Summary: Vite plugin for Litestar
 Project-URL: Changelog, https://cofin.github.io/litestar-vite/latest/changelog
 Project-URL: Discord, https://discord.gg/X3FJqy8d2j
@@ -30,7 +30,7 @@ Classifier: Topic :: Database :: Database Engines/Servers
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: litestar[cli,jinja]>=2.4.0
+Requires-Dist: litestar[jinja]>=2.4.0
 Provides-Extra: nodeenv
 Requires-Dist: nodeenv; extra == 'nodeenv'
 Description-Content-Type: text/markdown

{litestar_vite-0.1.20/examples/vanilla → litestar_vite-0.1.22/examples/basic}/app.py

@@ -24,9 +24,6 @@ class WebController(Controller):
 
 vite = VitePlugin(
     config=ViteConfig(
-        bundle_dir=Path(here / "public"),
-        resource_dir=Path(here / "resources"),
-        template_dir=Path(here / "templates"),
         hot_reload=True,
         port=3006,
         use_server_lifespan=True,

litestar_vite-0.1.22/examples/basic/package-lock.json

@@ -0,0 +1,398 @@
+{
+    "name": "tailwind",
+    "lockfileVersion": 3,
+    "requires": true,
+    "packages": {
+        "": {
+            "dependencies": {
+                "axios": "^1.6.2"
+            },
+            "devDependencies": {
+                "@types/node": "^20.10.3",
+                "litestar-vite-plugin": "^0.5.1",
+                "typescript": "^5.3.3",
+                "vite": "^5.0.6"
+            }
+        },
+        "node_modules/@esbuild/linux-x64": {
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
+            "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/@rollup/rollup-linux-x64-gnu": {
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+            "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@types/estree": {
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
+            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+            "dev": true
+        },
+        "node_modules/@types/node": {
+            "version": "20.11.30",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz",
+            "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==",
+            "dev": true,
+            "dependencies": {
+                "undici-types": "~5.26.4"
+            }
+        },
+        "node_modules/asynckit": {
+            "version": "0.4.0",
+            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+        },
+        "node_modules/axios": {
+            "version": "1.6.8",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
+            "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+            "dependencies": {
+                "follow-redirects": "^1.15.6",
+                "form-data": "^4.0.0",
+                "proxy-from-env": "^1.1.0"
+            }
+        },
+        "node_modules/combined-stream": {
+            "version": "1.0.8",
+            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+            "dependencies": {
+                "delayed-stream": "~1.0.0"
+            },
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/delayed-stream": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/esbuild": {
+            "version": "0.20.2",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
+            "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+            "dev": true,
+            "hasInstallScript": true,
+            "bin": {
+                "esbuild": "bin/esbuild"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "optionalDependencies": {
+                "@esbuild/aix-ppc64": "0.20.2",
+                "@esbuild/android-arm": "0.20.2",
+                "@esbuild/android-arm64": "0.20.2",
+                "@esbuild/android-x64": "0.20.2",
+                "@esbuild/darwin-arm64": "0.20.2",
+                "@esbuild/darwin-x64": "0.20.2",
+                "@esbuild/freebsd-arm64": "0.20.2",
+                "@esbuild/freebsd-x64": "0.20.2",
+                "@esbuild/linux-arm": "0.20.2",
+                "@esbuild/linux-arm64": "0.20.2",
+                "@esbuild/linux-ia32": "0.20.2",
+                "@esbuild/linux-loong64": "0.20.2",
+                "@esbuild/linux-mips64el": "0.20.2",
+                "@esbuild/linux-ppc64": "0.20.2",
+                "@esbuild/linux-riscv64": "0.20.2",
+                "@esbuild/linux-s390x": "0.20.2",
+                "@esbuild/linux-x64": "0.20.2",
+                "@esbuild/netbsd-x64": "0.20.2",
+                "@esbuild/openbsd-x64": "0.20.2",
+                "@esbuild/sunos-x64": "0.20.2",
+                "@esbuild/win32-arm64": "0.20.2",
+                "@esbuild/win32-ia32": "0.20.2",
+                "@esbuild/win32-x64": "0.20.2"
+            }
+        },
+        "node_modules/follow-redirects": {
+            "version": "1.15.6",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+            "funding": [
+                {
+                    "type": "individual",
+                    "url": "https://github.com/sponsors/RubenVerborgh"
+                }
+            ],
+            "engines": {
+                "node": ">=4.0"
+            },
+            "peerDependenciesMeta": {
+                "debug": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/form-data": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "dependencies": {
+                "asynckit": "^0.4.0",
+                "combined-stream": "^1.0.8",
+                "mime-types": "^2.1.12"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/litestar-vite-plugin": {
+            "version": "0.5.1",
+            "resolved": "https://registry.npmjs.org/litestar-vite-plugin/-/litestar-vite-plugin-0.5.1.tgz",
+            "integrity": "sha512-Zw0CFj9M4eP6A6pw7FIS9qne4C3+eSBAnnOLlI8fbgYLdSCdPbHmCUjVbM0W81G8ZJQ2aQB3S0KFQLt3hNVdzw==",
+            "dev": true,
+            "dependencies": {
+                "picocolors": "^1.0.0",
+                "vite-plugin-full-reload": "^1.1.0"
+            },
+            "bin": {
+                "clean-orphaned-assets": "bin/clean.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^5.0.0"
+            }
+        },
+        "node_modules/mime-db": {
+            "version": "1.52.0",
+            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/mime-types": {
+            "version": "2.1.35",
+            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+            "dependencies": {
+                "mime-db": "1.52.0"
+            },
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
+        "node_modules/nanoid": {
+            "version": "3.3.7",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "bin": {
+                "nanoid": "bin/nanoid.cjs"
+            },
+            "engines": {
+                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+            }
+        },
+        "node_modules/picocolors": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+            "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+            "dev": true
+        },
+        "node_modules/picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
+            "engines": {
+                "node": ">=8.6"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/postcss": {
+            "version": "8.4.38",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/postcss/"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "dependencies": {
+                "nanoid": "^3.3.7",
+                "picocolors": "^1.0.0",
+                "source-map-js": "^1.2.0"
+            },
+            "engines": {
+                "node": "^10 || ^12 || >=14"
+            }
+        },
+        "node_modules/proxy-from-env": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+        },
+        "node_modules/rollup": {
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+            "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
+            "dev": true,
+            "dependencies": {
+                "@types/estree": "1.0.5"
+            },
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=18.0.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@rollup/rollup-android-arm-eabi": "4.13.0",
+                "@rollup/rollup-android-arm64": "4.13.0",
+                "@rollup/rollup-darwin-arm64": "4.13.0",
+                "@rollup/rollup-darwin-x64": "4.13.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+                "@rollup/rollup-linux-arm64-musl": "4.13.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+                "@rollup/rollup-linux-x64-gnu": "4.13.0",
+                "@rollup/rollup-linux-x64-musl": "4.13.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+                "@rollup/rollup-win32-x64-msvc": "4.13.0",
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/source-map-js": {
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz",
+            "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==",
+            "dev": true,
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/typescript": {
+            "version": "5.4.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
+            "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
+            "dev": true,
+            "bin": {
+                "tsc": "bin/tsc",
+                "tsserver": "bin/tsserver"
+            },
+            "engines": {
+                "node": ">=14.17"
+            }
+        },
+        "node_modules/undici-types": {
+            "version": "5.26.5",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
+            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
+            "dev": true
+        },
+        "node_modules/vite": {
+            "version": "5.2.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.3.tgz",
+            "integrity": "sha512-+i1oagbvkVIhEy9TnEV+fgXsng13nZM90JQbrcPrf6DvW2mXARlz+DK7DLiDP+qeKoD1FCVx/1SpFL1CLq9Mhw==",
+            "dev": true,
+            "dependencies": {
+                "esbuild": "^0.20.1",
+                "postcss": "^8.4.36",
+                "rollup": "^4.13.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^18.0.0 || >=20.0.0",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite-plugin-full-reload": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/vite-plugin-full-reload/-/vite-plugin-full-reload-1.1.0.tgz",
+            "integrity": "sha512-3cObNDzX6DdfhD9E7kf6w2mNunFpD7drxyNgHLw+XwIYAgb+Xt16SEXo0Up4VH+TMf3n+DSVJZtW2POBGcBYAA==",
+            "dev": true,
+            "dependencies": {
+                "picocolors": "^1.0.0",
+                "picomatch": "^2.3.1"
+            }
+        }
+    }
+}

litestar_vite-0.1.22/examples/basic/public/manifest.json

@@ -0,0 +1,14 @@
+{
+  "resources/main.ts": {
+    "file": "assets/main-l0sNRNKZ.js",
+    "name": "main",
+    "src": "resources/main.ts",
+    "isEntry": true
+  },
+  "resources/styles.css": {
+    "file": "assets/styles-l0sNRNKZ.js",
+    "name": "styles",
+    "src": "resources/styles.css",
+    "isEntry": true
+  }
+}

litestar_vite-0.1.22/examples/basic/resources/main.ts

@@ -0,0 +1 @@
+import "@/styles.css"

{litestar_vite-0.1.20/examples/vanilla → litestar_vite-0.1.22/examples/basic}/tsconfig.json

@@ -17,12 +17,14 @@
     "baseUrl": "resources",
     "paths": {
       "@/*": ["./*"]
-    }
+    },
+    "types": ["vite/client"]
   },
   "include": [
+
     "**/*.d.ts",
-    "resources/**/*.js",
-    "resources/**/*.ts",
+    "resources/**/*.js" ,
+    "resources/**/*.ts" ,
     "vite.config.ts"
   ]
 }

{litestar_vite-0.1.20/examples/vanilla → litestar_vite-0.1.22/examples/basic}/vite.config.ts

@@ -1,5 +1,6 @@
 import { defineConfig } from "vite";
 
+
 import litestar from "litestar-vite-plugin";
 
 const ASSET_URL = process.env.ASSET_URL || "/static/";
@@ -7,20 +8,31 @@ const VITE_PORT = process.env.VITE_PORT || "5173";
 const VITE_HOST = process.env.VITE_HOST || "localhost";
 export default defineConfig({
   base: `${ASSET_URL}`,
+   root: ".",
   server: {
-    host: `${VITE_HOST}`,
+    host: "0.0.0.0",
     port: +`${VITE_PORT}`,
     cors: true,
+    hmr: {
+      host: `${VITE_HOST}`,
+    },
   },
   plugins: [
+
+
     litestar({
-      input: ["resources/styles.css", "resources/main.ts"],
+      input: [
+        "resources/main.ts", "resources/styles.css"
+      ],
       assetUrl: `${ASSET_URL}`,
+      bundleDirectory: "public",
+      resourceDirectory: "resources",
+      hotFile: "public/hot"
     }),
   ],
   resolve: {
     alias: {
-      "@": "resources",
+      "@": "resources"
     },
   },
 });

{litestar_vite-0.1.20 → litestar_vite-0.1.22}/litestar_vite/cli.py

@@ -144,6 +144,8 @@ def vite_init(
             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 = (

{litestar_vite-0.1.20 → litestar_vite-0.1.22}/litestar_vite/commands.py

@@ -5,16 +5,12 @@ import subprocess
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, MutableMapping
 
-from jinja2 import select_autoescape
-from litestar.serialization import encode_json
-
 if TYPE_CHECKING:
     from jinja2 import Environment, Template
     from litestar import Litestar
 
-VITE_INIT_TEMPLATES_PATH = f"{Path(__file__).parent}/templates"
 VITE_INIT_TEMPLATES: set[str] = {"package.json.j2", "tsconfig.json.j2", "vite.config.ts.j2"}
-DEFAULT_RESOURCES: set[str] = {"styles.css", "main.ts"}
+DEFAULT_RESOURCES: set[str] = {"styles.css.j2", "main.ts.j2"}
 DEFAULT_DEV_DEPENDENCIES: dict[str, str] = {
     "typescript": "^5.3.3",
     "vite": "^5.0.6",
@@ -33,6 +29,8 @@ def to_json(value: Any) -> str:
     Returns:
         JSON string.
     """
+    from litestar.serialization import encode_json
+
     return encode_json(value).decode("utf-8")
 
 
@@ -49,12 +47,13 @@ def init_vite(
     litestar_port: int,
 ) -> None:
     """Initialize a new vite project."""
-    from jinja2 import Environment, FileSystemLoader
+    from jinja2 import Environment, FileSystemLoader, select_autoescape
     from litestar.cli._utils import console
+    from litestar.utils import module_loader
 
-    entry_point: list[str] = []
+    template_path = module_loader.module_to_os_path("litestar_vite.templates")
     vite_template_env = Environment(
-        loader=FileSystemLoader([VITE_INIT_TEMPLATES_PATH]),
+        loader=FileSystemLoader([template_path]),
         autoescape=select_autoescape(),
     )
 
@@ -66,25 +65,23 @@ def init_vite(
         template_name: get_template(environment=vite_template_env, name=template_name)
         for template_name in enabled_templates
     }
-    entry_point = [
-        str(Path(resource_path / resource_name).relative_to(Path.cwd().absolute()))
-        for resource_name in enabled_resources
-    ]
     for template_name, template in templates.items():
         target_file_name = template_name.removesuffix(".j2")
         with Path(target_file_name).open(mode="w") as file:
-            console.print(f" * Writing {target_file_name} to {Path(target_file_name).absolute()}")
+            console.print(f" * Writing {target_file_name} to {Path(target_file_name)!s}")
 
             file.write(
                 template.render(
-                    entry_point=entry_point,
+                    entry_point=[
+                        f"{resource_path!s}/{resource_name.removesuffix('.j2')}" for resource_name in enabled_resources
+                    ],
                     enable_ssr=enable_ssr,
                     asset_url=asset_url,
-                    root_path=str(root_path.relative_to(Path.cwd().absolute())),
+                    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(Path.cwd().absolute())),
+                    hot_file=str(hot_file.relative_to(root_path)),
                     vite_port=str(vite_port),
                     litestar_port=litestar_port,
                     dependencies=to_json(dependencies),
@@ -93,8 +90,11 @@ def init_vite(
             )
 
     for resource_name in enabled_resources:
-        with Path(resource_path / resource_name).open(mode="w") as file:
-            console.print(f" * Writing {resource_name} to {Path(resource_path / resource_name).absolute()}")
+        template = get_template(environment=vite_template_env, name=resource_name)
+        target_file_name = f"{resource_path}/{resource_name.removesuffix('.j2')}"
+        with Path(target_file_name).open(mode="w") as file:
+            console.print(f" * Writing {resource_name.removesuffix('.j2')} to {Path(target_file_name)!s}")
+            file.write(template.render())
     console.print("[yellow]Vite initialization completed.[/]")
 
 

{litestar_vite-0.1.20 → litestar_vite-0.1.22}/litestar_vite/config.py

@@ -18,9 +18,8 @@ if TYPE_CHECKING:
 
     from litestar.types import PathType
 
-    from litestar_vite.template_engine import ViteTemplateEngine
 
-T = TypeVar("T", bound=TemplateEngineProtocol)
+EngineType = TypeVar("EngineType", bound=TemplateEngineProtocol)
 
 
 @dataclass
@@ -127,7 +126,7 @@ class ViteConfig:
 
 
 @dataclass
-class ViteTemplateConfig(Generic[T]):
+class ViteTemplateConfig(Generic[EngineType]):
     """Configuration for Templating.
 
     To enable templating, pass an instance of this class to the
@@ -135,27 +134,30 @@ class ViteTemplateConfig(Generic[T]):
     'template_config' key.
     """
 
-    engine: type[ViteTemplateEngine]
-    """A template engine adhering to the :class:`TemplateEngineProtocol
-    <litestar.template.base.TemplateEngineProtocol>`."""
     config: ViteConfig
     """A a config for the vite engine`."""
-    directory: PathType | None = field(default=None)
+    engine: type[EngineType] | EngineType | None = field(default=None)
+    """A template engine adhering to the :class:`TemplateEngineProtocol
+    <litestar.template.base.TemplateEngineProtocol>`."""
+    directory: PathType | list[PathType] | None = field(default=None)
     """A directory or list of directories from which to serve templates."""
-    engine_callback: Callable[[T], None] | None = field(default=None)
+    engine_callback: Callable[[EngineType], None] | None = field(default=None)
     """A callback function that allows modifying the instantiated templating
     protocol."""
 
+    instance: EngineType | None = field(default=None)
+    """An instance of the templating protocol."""
+
     def __post_init__(self) -> None:
         """Ensure that directory is set if engine is a class."""
         if isclass(self.engine) and not self.directory:
             msg = "directory is a required kwarg when passing a template engine class"
             raise ImproperlyConfiguredException(msg)
 
-    def to_engine(self) -> T:
+    def to_engine(self) -> EngineType:
         """Instantiate the template engine."""
         template_engine = cast(
-            "T",
+            "EngineType",
             self.engine(directory=self.directory, config=self.config) if isclass(self.engine) else self.engine,
         )
         if callable(self.engine_callback):
@@ -163,6 +165,6 @@ class ViteTemplateConfig(Generic[T]):
         return template_engine
 
     @cached_property
-    def engine_instance(self) -> T:
+    def engine_instance(self) -> EngineType:
         """Return the template engine instance."""
         return self.to_engine()