litestar-vite-plugin 0.1.5 → 0.1.8

package/dist/index.cjs

@@ -40,6 +40,7 @@ const refreshPaths = [
   "**/*.py",
   "**/*.j2",
   "**/*.html.j2",
+  "**/*.html",
   "**/assets/**/*"
 ];
 function litestar(config) {
@@ -63,13 +64,14 @@ function resolveLitestarPlugin(pluginConfig) {
       userConfig = config;
       const ssr = !!userConfig.build?.ssr;
       const env = (0, import_vite.loadEnv)(mode, userConfig.envDir || process.cwd(), "");
-      const assetUrl = env.ASSET_URL || pluginConfig.assetUrl;
+      const assetUrl = env.LITESTAR_ASSET_URL || pluginConfig.assetUrl;
       const serverConfig = command === "serve" ? resolveDevelopmentEnvironmentServerConfig(
         pluginConfig.detectTls
       ) ?? resolveEnvironmentServerConfig(env) : void 0;
       ensureCommandShouldRunInEnvironment(command, env);
       return {
         base: userConfig.base ?? (command === "build" ? resolveBase(pluginConfig, assetUrl) : pluginConfig.assetUrl),
+        root: pluginConfig.rootDirectory,
         publicDir: userConfig.publicDir ?? false,
         build: {
           manifest: userConfig.build?.manifest ?? !ssr,
@@ -241,6 +243,14 @@ function resolvePluginConfig(config) {
       );
     }
   }
+  if (typeof config.rootDirectory === "string") {
+    config.rootDirectory = config.rootDirectory.trim().replace(/^\/+/, "");
+    if (config.rootDirectory === "") {
+      throw new Error(
+        "litestar-vite-plugin: rootDirectory must be a subdirectory. E.g. '.'."
+      );
+    }
+  }
   if (typeof config.assetDirectory === "string") {
     config.assetDirectory = config.assetDirectory.trim().replace(/^\/+/, "");
     if (config.assetDirectory === "") {
@@ -249,11 +259,11 @@ function resolvePluginConfig(config) {
       );
     }
   }
-  if (typeof config.buildDirectory === "string") {
-    config.buildDirectory = config.buildDirectory.trim().replace(/^\/+/, "").replace(/\/+$/, "");
-    if (config.buildDirectory === "") {
+  if (typeof config.bundleDirectory === "string") {
+    config.bundleDirectory = config.bundleDirectory.trim().replace(/^\/+/, "").replace(/\/+$/, "");
+    if (config.bundleDirectory === "") {
       throw new Error(
-        "litestar-vite-plugin: buildDirectory must be a subdirectory. E.g. 'public'."
+        "litestar-vite-plugin: bundleDirectory must be a subdirectory. E.g. 'public'."
       );
     }
   }
@@ -265,14 +275,15 @@ function resolvePluginConfig(config) {
   }
   return {
     input: config.input,
+    rootDirectory: config.rootDirectory ?? process.cwd(),
     assetUrl: config.assetUrl || (config.assetUrl ?? "static"),
     resourceDirectory: config.resourceDirectory ?? "/resources/",
     assetDirectory: config.assetDirectory ?? "assets",
-    buildDirectory: config.buildDirectory || (config.buildDirectory ?? "public"),
+    bundleDirectory: config.bundleDirectory || (config.bundleDirectory ?? "public"),
     ssr: config.ssr ?? config.input,
-    ssrOutputDirectory: config.ssrOutputDirectory ?? "bootstrap/ssr",
+    ssrOutputDirectory: config.ssrOutputDirectory ?? import_path.default.join(config.resourceDirectory ?? "resources", "bootstrap/ssr"),
     refresh: config.refresh ?? false,
-    hotFile: config.hotFile ?? import_path.default.join(config.assetDirectory ?? "hot"),
+    hotFile: config.hotFile ?? import_path.default.join(config.bundleDirectory ?? "public", "hot"),
     detectTls: config.detectTls ?? false,
     transformOnServe: config.transformOnServe ?? ((code) => code)
   };
@@ -290,7 +301,7 @@ function resolveOutDir(config, ssr) {
   if (ssr) {
     return config.ssrOutputDirectory;
   }
-  return import_path.default.join(config.buildDirectory);
+  return import_path.default.join(config.bundleDirectory);
 }
 function resolveFullReloadConfig({
   refresh: config

package/dist/index.d.ts

@@ -12,15 +12,21 @@ interface PluginConfig {
      */
     assetUrl?: string;
     /**
-     * The public directory where all compiled assets should be written.
+     * The public directory where all compiled/bundled assets should be written.
      *
-     * @default 'public'
+     * @default 'public/dist'
      */
-    buildDirectory?: string;
+    bundleDirectory?: string;
     /**
-     * The directory where all typescript/javascript source are written.  This is used as the default "@" alias is pointed.
+     * The root directory for your project.
      *
-     * @default 'resources'
+     * @default ''
+     */
+    rootDirectory?: string;
+    /**
+     * Litestar's public assets directory.  These are the assets that Vite will serve when developing.
+     *
+     * @default '${rootDirectory}/resources'
      */
     resourceDirectory?: string;
     /**
@@ -32,7 +38,7 @@ interface PluginConfig {
     /**
      * The path to the "hot" file.
      *
-     * @default `${buildDirectory}/hot`
+     * @default `${bundleDirectory}/hot`
      */
     hotFile?: string;
     /**
@@ -42,7 +48,7 @@ interface PluginConfig {
     /**
      * The directory where the SSR bundle should be written.
      *
-     * @default '${buildDirectory}/bootstrap/ssr'
+     * @default '${bundleDirectory}/bootstrap/ssr'
      */
     ssrOutputDirectory?: string;
     /**

package/dist/index.mjs

@@ -11,6 +11,7 @@ const refreshPaths = [
   "**/*.py",
   "**/*.j2",
   "**/*.html.j2",
+  "**/*.html",
   "**/assets/**/*"
 ];
 function litestar(config) {
@@ -34,13 +35,14 @@ function resolveLitestarPlugin(pluginConfig) {
       userConfig = config;
       const ssr = !!userConfig.build?.ssr;
       const env = loadEnv(mode, userConfig.envDir || process.cwd(), "");
-      const assetUrl = env.ASSET_URL || pluginConfig.assetUrl;
+      const assetUrl = env.LITESTAR_ASSET_URL || pluginConfig.assetUrl;
       const serverConfig = command === "serve" ? resolveDevelopmentEnvironmentServerConfig(
         pluginConfig.detectTls
       ) ?? resolveEnvironmentServerConfig(env) : void 0;
       ensureCommandShouldRunInEnvironment(command, env);
       return {
         base: userConfig.base ?? (command === "build" ? resolveBase(pluginConfig, assetUrl) : pluginConfig.assetUrl),
+        root: pluginConfig.rootDirectory,
         publicDir: userConfig.publicDir ?? false,
         build: {
           manifest: userConfig.build?.manifest ?? !ssr,
@@ -212,6 +214,14 @@ function resolvePluginConfig(config) {
       );
     }
   }
+  if (typeof config.rootDirectory === "string") {
+    config.rootDirectory = config.rootDirectory.trim().replace(/^\/+/, "");
+    if (config.rootDirectory === "") {
+      throw new Error(
+        "litestar-vite-plugin: rootDirectory must be a subdirectory. E.g. '.'."
+      );
+    }
+  }
   if (typeof config.assetDirectory === "string") {
     config.assetDirectory = config.assetDirectory.trim().replace(/^\/+/, "");
     if (config.assetDirectory === "") {
@@ -220,11 +230,11 @@ function resolvePluginConfig(config) {
       );
     }
   }
-  if (typeof config.buildDirectory === "string") {
-    config.buildDirectory = config.buildDirectory.trim().replace(/^\/+/, "").replace(/\/+$/, "");
-    if (config.buildDirectory === "") {
+  if (typeof config.bundleDirectory === "string") {
+    config.bundleDirectory = config.bundleDirectory.trim().replace(/^\/+/, "").replace(/\/+$/, "");
+    if (config.bundleDirectory === "") {
       throw new Error(
-        "litestar-vite-plugin: buildDirectory must be a subdirectory. E.g. 'public'."
+        "litestar-vite-plugin: bundleDirectory must be a subdirectory. E.g. 'public'."
       );
     }
   }
@@ -236,14 +246,15 @@ function resolvePluginConfig(config) {
   }
   return {
     input: config.input,
+    rootDirectory: config.rootDirectory ?? process.cwd(),
     assetUrl: config.assetUrl || (config.assetUrl ?? "static"),
     resourceDirectory: config.resourceDirectory ?? "/resources/",
     assetDirectory: config.assetDirectory ?? "assets",
-    buildDirectory: config.buildDirectory || (config.buildDirectory ?? "public"),
+    bundleDirectory: config.bundleDirectory || (config.bundleDirectory ?? "public"),
     ssr: config.ssr ?? config.input,
-    ssrOutputDirectory: config.ssrOutputDirectory ?? "bootstrap/ssr",
+    ssrOutputDirectory: config.ssrOutputDirectory ?? path.join(config.resourceDirectory ?? "resources", "bootstrap/ssr"),
     refresh: config.refresh ?? false,
-    hotFile: config.hotFile ?? path.join(config.assetDirectory ?? "hot"),
+    hotFile: config.hotFile ?? path.join(config.bundleDirectory ?? "public", "hot"),
     detectTls: config.detectTls ?? false,
     transformOnServe: config.transformOnServe ?? ((code) => code)
   };
@@ -261,7 +272,7 @@ function resolveOutDir(config, ssr) {
   if (ssr) {
     return config.ssrOutputDirectory;
   }
-  return path.join(config.buildDirectory);
+  return path.join(config.bundleDirectory);
 }
 function resolveFullReloadConfig({
   refresh: config

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "litestar-vite-plugin",
-    "version": "0.1.5",
+    "version": "0.1.8",
     "description": "Litestar plugin for Vite.",
     "keywords": [
         "litestar",