litestar-vite-plugin 0.13.0 → 0.13.2

package/dist/js/index.js

@@ -10,12 +10,34 @@ function litestar(config) {
   const pluginConfig = resolvePluginConfig(config);
   return [resolveLitestarPlugin(pluginConfig), ...resolveFullReloadConfig(pluginConfig)];
 }
+async function findIndexHtmlPath(server, pluginConfig) {
+  if (!pluginConfig.autoDetectIndex) {
+    console.log("Auto-detection disabled.");
+    return null;
+  }
+  const root = server.config.root;
+  const possiblePaths = [
+    path.join(root, "index.html"),
+    path.join(root, pluginConfig.resourceDirectory.replace(/^\//, ""), "index.html"),
+    // Ensure resourceDirectory path is relative to root
+    path.join(root, "public", "index.html")
+    // Check public even if publicDir is false, might exist
+  ];
+  for (const indexPath of possiblePaths) {
+    try {
+      await fs.promises.access(indexPath);
+      return indexPath;
+    } catch {
+    }
+  }
+  return null;
+}
 function resolveLitestarPlugin(pluginConfig) {
   let viteDevServerUrl;
   let resolvedConfig;
   let userConfig;
   const defaultAliases = {
-    "@": pluginConfig.resourceDirectory || "/resources/"
+    "@": `/${pluginConfig.resourceDirectory.replace(/^\/+/, "").replace(/\/+$/, "")}/`
   };
   return {
     name: "litestar",
@@ -71,13 +93,21 @@ function resolveLitestarPlugin(pluginConfig) {
         ssr: {
           noExternal: noExternalInertiaHelpers(userConfig)
         }
+        // Explicitly set appType if you know you're serving an SPA index.html
+        // appType: 'spa', // Try adding this - might simplify things if appropriate
       };
     },
     configResolved(config) {
       resolvedConfig = config;
+      if (resolvedConfig.command === "serve" && resolvedConfig.base && !resolvedConfig.base.endsWith("/")) {
+        resolvedConfig = {
+          ...resolvedConfig,
+          base: `${resolvedConfig.base}/`
+        };
+      }
     },
-    transform(code) {
-      if (resolvedConfig.command === "serve") {
+    transform(code, id) {
+      if (resolvedConfig.command === "serve" && code.includes("__litestar_vite_placeholder__")) {
         const transformedCode = code.replace(/__litestar_vite_placeholder__/g, viteDevServerUrl);
         return pluginConfig.transformOnServe(transformedCode, viteDevServerUrl);
       }
@@ -86,22 +116,7 @@ function resolveLitestarPlugin(pluginConfig) {
     async configureServer(server) {
       const envDir = resolvedConfig.envDir || process.cwd();
       const appUrl = loadEnv(resolvedConfig.mode, envDir, "APP_URL").APP_URL ?? "undefined";
-      const shouldServeIndex = () => {
-        if (!pluginConfig.autoDetectIndex) return false;
-        const possiblePaths = [
-          path.join(server.config.root, "index.html"),
-          path.join(server.config.root, pluginConfig.resourceDirectory, "index.html"),
-          path.join(server.config.root, "public", "index.html")
-        ];
-        for (const indexPath of possiblePaths) {
-          try {
-            fs.accessSync(indexPath);
-            return true;
-          } catch {
-          }
-        }
-        return false;
-      };
+      const initialIndexPath = await findIndexHtmlPath(server, pluginConfig);
       server.httpServer?.once("listening", () => {
         const address = server.httpServer?.address();
         const isAddressInfo = (x) => typeof x === "object";
@@ -109,26 +124,26 @@ function resolveLitestarPlugin(pluginConfig) {
           viteDevServerUrl = userConfig.server?.origin ? userConfig.server.origin : resolveDevServerUrl(address, server.config, userConfig);
           fs.mkdirSync(path.dirname(pluginConfig.hotFile), { recursive: true });
           fs.writeFileSync(pluginConfig.hotFile, viteDevServerUrl);
-          const hasIndex = shouldServeIndex();
           setTimeout(() => {
-            server.config.logger.info(`
+            resolvedConfig.logger.info(`
   ${colors.red(`${colors.bold("LITESTAR")} ${litestarVersion()}`)}  ${colors.dim("plugin")} ${colors.bold(`v${pluginVersion()}`)}`);
-            server.config.logger.info("");
-            if (hasIndex) {
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Serve Index")}: Serving application index with Vite`);
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("DEV URL")}: ${colors.cyan(viteDevServerUrl)}`);
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("APP_URL")}: ${colors.cyan(appUrl.replace(/:(\d+)/, (_, port) => `:${colors.bold(port)}`))}`);
+            resolvedConfig.logger.info("");
+            if (initialIndexPath) {
+              resolvedConfig.logger.info(
+                `  ${colors.green("\u279C")}  ${colors.bold("Index Mode")}: SPA (Serving ${colors.cyan(path.relative(server.config.root, initialIndexPath))} from root)`
+              );
             } else {
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Serve Index")}: Serving Litestar index with Vite`);
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("DEV URL")}: ${colors.cyan(viteDevServerUrl)}`);
-              server.config.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("APP_URL")}: ${colors.cyan(appUrl.replace(/:(\d+)/, (_, port) => `:${colors.bold(port)}`))}`);
+              resolvedConfig.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Index Mode")}: Litestar (Plugin will serve placeholder for /index.html)`);
             }
+            resolvedConfig.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Dev Server")}: ${colors.cyan(viteDevServerUrl)}`);
+            resolvedConfig.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("App URL")}:    ${colors.cyan(appUrl.replace(/:(\d+)/, (_, port) => `:${colors.bold(port)}`))}`);
+            resolvedConfig.logger.info(`  ${colors.green("\u279C")}  ${colors.bold("Assets Base")}: ${colors.cyan(resolvedConfig.base)}`);
           }, 100);
         }
       });
       if (!exitHandlersBound) {
         const clean = () => {
-          if (fs.existsSync(pluginConfig.hotFile)) {
+          if (pluginConfig.hotFile && fs.existsSync(pluginConfig.hotFile)) {
             fs.rmSync(pluginConfig.hotFile);
           }
         };
@@ -138,15 +153,41 @@ function resolveLitestarPlugin(pluginConfig) {
         process.on("SIGHUP", () => process.exit());
         exitHandlersBound = true;
       }
-      return () => server.middlewares.use((req, res, next) => {
-        if (!shouldServeIndex() && req.url === "/index.html") {
-          res.statusCode = 404;
-          res.end(
-            fs.readFileSync(path.join(dirname(), "dev-server-index.html")).toString().replace(/{{ APP_URL }}/g, appUrl)
-          );
-        }
-        next();
-      });
+      return () => {
+        server.middlewares.use(async (req, res, next) => {
+          const indexPath = await findIndexHtmlPath(server, pluginConfig);
+          if (indexPath && (req.url === "/" || req.url === "/index.html")) {
+            const currentUrl = req.url;
+            try {
+              const htmlContent = await fs.promises.readFile(indexPath, "utf-8");
+              const transformedHtml = await server.transformIndexHtml(req.originalUrl ?? currentUrl, htmlContent, req.originalUrl);
+              res.statusCode = 200;
+              res.setHeader("Content-Type", "text/html");
+              res.end(transformedHtml);
+              return;
+            } catch (e) {
+              resolvedConfig.logger.error(`Error serving index.html from ${indexPath}: ${e instanceof Error ? e.message : e}`);
+              next(e);
+              return;
+            }
+          }
+          if (!indexPath && req.url === "/index.html") {
+            try {
+              const placeholderPath = path.join(dirname(), "dev-server-index.html");
+              const placeholderContent = await fs.promises.readFile(placeholderPath, "utf-8");
+              res.statusCode = 200;
+              res.setHeader("Content-Type", "text/html");
+              res.end(placeholderContent.replace(/{{ APP_URL }}/g, appUrl));
+            } catch (e) {
+              resolvedConfig.logger.error(`Error serving placeholder index.html: ${e instanceof Error ? e.message : e}`);
+              res.statusCode = 404;
+              res.end("Not Found (Error loading placeholder)");
+            }
+            return;
+          }
+          next();
+        });
+      };
     }
   };
 }
@@ -185,7 +226,7 @@ function resolvePluginConfig(config) {
     throw new Error('litestar-vite-plugin: missing configuration for "input".');
   }
   if (typeof resolvedConfig.resourceDirectory === "string") {
-    resolvedConfig.resourceDirectory = resolvedConfig.resourceDirectory.trim().replace(/^\/+/, "");
+    resolvedConfig.resourceDirectory = resolvedConfig.resourceDirectory.trim().replace(/^\/+/, "").replace(/\/+$/, "");
     if (resolvedConfig.resourceDirectory === "") {
       throw new Error("litestar-vite-plugin: resourceDirectory must be a subdirectory. E.g. 'resources'.");
     }
@@ -205,8 +246,8 @@ function resolvePluginConfig(config) {
   return {
     input: resolvedConfig.input,
     assetUrl: resolvedConfig.assetUrl ?? "static",
-    resourceDirectory: resolvedConfig.resourceDirectory ?? "/resources/",
-    bundleDirectory: resolvedConfig.bundleDirectory || (resolvedConfig.bundleDirectory ?? "public"),
+    resourceDirectory: resolvedConfig.resourceDirectory ?? "resources",
+    bundleDirectory: resolvedConfig.bundleDirectory ?? "public",
     ssr: resolvedConfig.ssr ?? resolvedConfig.input,
     ssrOutputDirectory: resolvedConfig.ssrOutputDirectory ?? path.join(resolvedConfig.resourceDirectory ?? "resources", "bootstrap/ssr"),
     refresh: resolvedConfig.refresh ?? false,
@@ -217,7 +258,10 @@ function resolvePluginConfig(config) {
   };
 }
 function resolveBase(config, assetUrl) {
-  return assetUrl + (assetUrl.endsWith("/") ? "" : "/");
+  if (process.env.NODE_ENV === "development") {
+    return assetUrl;
+  }
+  return assetUrl.endsWith("/") ? assetUrl : `${assetUrl}/`;
 }
 function resolveInput(config, ssr) {
   if (ssr) {
@@ -227,9 +271,9 @@ function resolveInput(config, ssr) {
 }
 function resolveOutDir(config, ssr) {
   if (ssr) {
-    return config.ssrOutputDirectory;
+    return config.ssrOutputDirectory.replace(/^\/+/, "").replace(/\/+$/, "");
   }
-  return path.join(config.bundleDirectory);
+  return config.bundleDirectory.replace(/^\/+/, "").replace(/\/+$/, "");
 }
 function resolveFullReloadConfig({ refresh: config }) {
   if (typeof config === "boolean") {
@@ -353,7 +397,11 @@ function resolveDevelopmentEnvironmentTld(configPath) {
   return config.tld;
 }
 function dirname() {
-  return fileURLToPath(new URL(".", import.meta.url));
+  try {
+    return fileURLToPath(new URL(".", import.meta.url));
+  } catch {
+    return path.resolve(process.cwd(), "src/js/src");
+  }
 }
 export {
   litestar as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "litestar-vite-plugin",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "type": "module",
   "description": "Litestar plugin for Vite.",
   "keywords": ["litestar", "vite", "vite-plugin"],
@@ -37,12 +37,12 @@
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@types/node": "^22.10.1",
-    "esbuild": "0.24.0",
-    "happy-dom": "^15.11.7",
-    "typescript": "^5.7.2",
-    "vite": "^6.0.1",
-    "vitest": "^2.1.8"
+    "@types/node": "^22.15.3",
+    "esbuild": "0.25.3",
+    "happy-dom": "^17.4.6",
+    "typescript": "^5.8.3",
+    "vite": "^6.3.5",
+    "vitest": "^3.1.2"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0"