litestar-vite-plugin 0.24.1 → 0.26.0

package/dist/js/index.js

@@ -6,12 +6,11 @@ import { loadEnv } from "vite";
 import fullReload from "vite-plugin-full-reload";
 import { checkBackendAvailability, loadLitestarMeta } from "./litestar-meta.js";
 import { readBridgeConfig } from "./shared/bridge-schema.js";
-import { DEBOUNCE_MS } from "./shared/constants.js";
 import { createLogger } from "./shared/logger.js";
 import { resolveLitestarPort } from "./shared/network.js";
 import { resolveDefaultSdkClientPlugin } from "./shared/typegen-core.js";
-import { createLitestarTypeGenPlugin } from "./shared/typegen-plugin.js";
-import { buildInputOptions, resolveUserBuildInput } from "./shared/vite-compat.js";
+import { createLitestarTypeGenPlugin, resolveTypesConfig } from "./shared/typegen-plugin.js";
+import { buildInputOptions, hmrServerConfig, resolveUserBuildInput } from "./shared/vite-compat.js";
 let exitHandlersBound = false;
 let warnedMissingRuntimeConfig = false;
 const MAX_TRANSFORM_PAYLOAD_BYTES = 1e6;
@@ -94,32 +93,32 @@ function resolveLitestarPlugin(pluginConfig) {
       const proxyHmrClientPort = pythonDefaults?.proxyMode === "vite" ? resolveLitestarPort(pythonDefaults.litestarPort, effectiveAppUrl, process.env) : null;
       const withProxyErrorSilencer = (proxyConfig) => {
         if (!proxyConfig) return void 0;
-        return Object.fromEntries(
-          Object.entries(proxyConfig).map(([key, value]) => {
-            if (typeof value !== "object" || value === null) {
-              return [key, value];
-            }
-            const existingConfigure = value.configure;
-            const valueWithWebsocket = Object.hasOwn(value, "ws") ? value : { ...value, ws: true };
-            return [
-              key,
-              {
-                ...valueWithWebsocket,
-                configure(proxy, opts) {
-                  proxy.on("error", (err) => {
-                    const msg = String(err?.message ?? "");
-                    if (shuttingDown || msg.includes("ECONNREFUSED") || msg.includes("ECONNRESET") || msg.includes("socket hang up")) {
-                      return;
-                    }
-                  });
-                  if (typeof existingConfigure === "function") {
-                    existingConfigure(proxy, opts);
-                  }
-                }
+        const entries = Object.entries(proxyConfig).map(([key, value]) => {
+          if (typeof value !== "object" || value === null) {
+            return [key, value];
+          }
+          const existingConfigure = value.configure;
+          const valueWithWebsocket = Object.hasOwn(value, "ws") ? value : { ...value, ws: true };
+          const configure = (proxy, opts) => {
+            proxy.on("error", (err) => {
+              const msg = err.message;
+              if (shuttingDown || msg.includes("ECONNREFUSED") || msg.includes("ECONNRESET") || msg.includes("socket hang up")) {
+                return;
               }
-            ];
-          })
-        );
+            });
+            if (typeof existingConfigure === "function") {
+              existingConfigure(proxy, opts);
+            }
+          };
+          return [
+            key,
+            {
+              ...valueWithWebsocket,
+              configure
+            }
+          ];
+        });
+        return Object.fromEntries(entries);
       };
       const explicitServerOrigin = typeof userConfig.server?.origin === "string" && userConfig.server.origin.length > 0 ? userConfig.server.origin : void 0;
       const shouldForceDirectServerOrigin = explicitServerOrigin !== void 0 || pythonDefaults?.proxyMode === "direct";
@@ -139,15 +138,19 @@ function resolveLitestarPlugin(pluginConfig) {
         },
         server: {
           origin: shouldForceDirectServerOrigin ? explicitServerOrigin ?? "__litestar_vite_placeholder__" : proxyOriginDefault,
-          // Auto-configure HMR to use a path that routes through Litestar proxy
-          // Note: Vite automatically prepends `base` to `hmr.path`, so we just use "vite-hmr"
-          // Result: base="/static/" + path="vite-hmr" = "/static/vite-hmr"
-          hmr: userConfig.server?.hmr === false ? false : {
+          // Auto-configure the HMR WebSocket to use a path that routes through the Litestar proxy.
+          // Auto-configure the HMR WebSocket to route through the Litestar proxy.
+          // Vite 8.1 moved the HMR network options (path/host/port/clientPort/protocol/timeout)
+          // from `server.hmr.*` to `server.ws.*`; on Vite 7 / 8.0 they stay under `server.hmr.*`.
+          // `hmrServerConfig` picks the right key for the running version (deprecation-free on each).
+          // Note: Vite prepends `base` to the path, so we use "vite-hmr" => "/static/vite-hmr".
+          ...userConfig.server?.hmr === false || userConfig.server?.ws === false ? { hmr: false } : hmrServerConfig({
             path: "vite-hmr",
             ...proxyHmrClientPort ? { clientPort: proxyHmrClientPort } : {},
-            ...serverConfig?.hmr,
-            ...userConfig.server?.hmr === true ? {} : userConfig.server?.hmr
-          },
+            ...serverConfig?.host ? { host: serverConfig.host } : {},
+            ...typeof userConfig.server?.ws === "object" ? userConfig.server.ws : {},
+            ...typeof userConfig.server?.hmr === "object" ? userConfig.server.hmr : {}
+          }),
           // Auto-configure proxy to forward API requests to Litestar backend
           // This allows the app to work when accessing Vite directly (not through Litestar proxy)
           // Only proxies /api and /schema routes - everything else is handled by Vite
@@ -583,80 +586,11 @@ function resolvePluginConfig(config) {
   if (resolvedConfig.refresh === true) {
     resolvedConfig.refresh = [{ paths: refreshPaths }];
   }
-  let typesConfig = false;
-  const defaultTypesOutput = "src/generated";
-  const defaultOpenapiPath = path.join(defaultTypesOutput, "openapi.json");
-  const defaultRoutesPath = path.join(defaultTypesOutput, "routes.json");
-  const defaultSchemasTsPath = path.join(defaultTypesOutput, "schemas.ts");
-  const defaultPagePropsPath = path.join(defaultTypesOutput, "inertia-pages.json");
-  if (resolvedConfig.types === false) {
-  } else if (resolvedConfig.types === true) {
-    typesConfig = {
-      enabled: true,
-      output: defaultTypesOutput,
-      openapiPath: defaultOpenapiPath,
-      routesPath: defaultRoutesPath,
-      pagePropsPath: defaultPagePropsPath,
-      schemasTsPath: defaultSchemasTsPath,
-      generateZod: false,
-      generateSdk: true,
-      generateRoutes: true,
-      generatePageProps: true,
-      generateSchemas: true,
-      globalRoute: false,
-      debounce: DEBOUNCE_MS
-    };
-  } else if (resolvedConfig.types === "auto" || typeof resolvedConfig.types === "undefined") {
-    if (pythonDefaults?.types) {
-      typesConfig = {
-        enabled: pythonDefaults.types.enabled,
-        output: pythonDefaults.types.output,
-        openapiPath: pythonDefaults.types.openapiPath,
-        routesPath: pythonDefaults.types.routesPath,
-        pagePropsPath: pythonDefaults.types.pagePropsPath,
-        schemasTsPath: pythonDefaults.types.schemasTsPath ?? path.join(pythonDefaults.types.output, "schemas.ts"),
-        generateZod: pythonDefaults.types.generateZod,
-        generateSdk: pythonDefaults.types.generateSdk,
-        generateRoutes: pythonDefaults.types.generateRoutes,
-        generatePageProps: pythonDefaults.types.generatePageProps,
-        generateSchemas: pythonDefaults.types.generateSchemas ?? true,
-        globalRoute: pythonDefaults.types.globalRoute,
-        debounce: DEBOUNCE_MS
-      };
-    }
-  } else if (typeof resolvedConfig.types === "object" && resolvedConfig.types !== null) {
-    const userProvidedOpenapi = Object.hasOwn(resolvedConfig.types, "openapiPath");
-    const userProvidedRoutes = Object.hasOwn(resolvedConfig.types, "routesPath");
-    const userProvidedPageProps = Object.hasOwn(resolvedConfig.types, "pagePropsPath");
-    const userProvidedSchemasTs = Object.hasOwn(resolvedConfig.types, "schemasTsPath");
-    typesConfig = {
-      enabled: resolvedConfig.types.enabled ?? true,
-      output: resolvedConfig.types.output ?? defaultTypesOutput,
-      openapiPath: resolvedConfig.types.openapiPath ?? (resolvedConfig.types.output ? path.join(resolvedConfig.types.output, "openapi.json") : defaultOpenapiPath),
-      routesPath: resolvedConfig.types.routesPath ?? (resolvedConfig.types.output ? path.join(resolvedConfig.types.output, "routes.json") : defaultRoutesPath),
-      pagePropsPath: resolvedConfig.types.pagePropsPath ?? (resolvedConfig.types.output ? path.join(resolvedConfig.types.output, "inertia-pages.json") : defaultPagePropsPath),
-      schemasTsPath: resolvedConfig.types.schemasTsPath ?? (resolvedConfig.types.output ? path.join(resolvedConfig.types.output, "schemas.ts") : defaultSchemasTsPath),
-      generateZod: resolvedConfig.types.generateZod ?? false,
-      generateSdk: resolvedConfig.types.generateSdk ?? true,
-      generateRoutes: resolvedConfig.types.generateRoutes ?? true,
-      generatePageProps: resolvedConfig.types.generatePageProps ?? true,
-      generateSchemas: resolvedConfig.types.generateSchemas ?? true,
-      globalRoute: resolvedConfig.types.globalRoute ?? false,
-      debounce: resolvedConfig.types.debounce ?? DEBOUNCE_MS
-    };
-    if (!userProvidedOpenapi && resolvedConfig.types.output) {
-      typesConfig.openapiPath = path.join(typesConfig.output, "openapi.json");
-    }
-    if (!userProvidedRoutes && resolvedConfig.types.output) {
-      typesConfig.routesPath = path.join(typesConfig.output, "routes.json");
-    }
-    if (!userProvidedPageProps && resolvedConfig.types.output) {
-      typesConfig.pagePropsPath = path.join(typesConfig.output, "inertia-pages.json");
-    }
-    if (!userProvidedSchemasTs && resolvedConfig.types.output) {
-      typesConfig.schemasTsPath = path.join(typesConfig.output, "schemas.ts");
-    }
-  }
+  const typesConfig = resolveTypesConfig({
+    requested: resolvedConfig.types,
+    pythonConfig: pythonDefaults?.types ?? void 0,
+    defaultOutput: "src/generated"
+  });
   const bridgeInertiaEnabled = pythonDefaults?.spa !== null && pythonDefaults?.spa !== void 0;
   const inertiaMode = resolvedConfig.inertiaMode ?? bridgeInertiaEnabled;
   const effectiveResourceDir = resolvedConfig.resourceDir ?? pythonDefaults?.resourceDir ?? "src";
@@ -793,34 +727,34 @@ function createStaticPropsPlugin() {
   };
 }
 function resolveDevServerUrl(address, config, userConfig) {
-  const configHmrProtocol = typeof config.server.hmr === "object" ? config.server.hmr.protocol : null;
-  const clientProtocol = configHmrProtocol ? configHmrProtocol === "wss" ? "https" : "http" : null;
+  const configHmrNet = (typeof config.server.ws === "object" ? config.server.ws : null) ?? (typeof config.server.hmr === "object" ? config.server.hmr : null);
+  const configWsProtocol = configHmrNet?.protocol ?? null;
+  const clientProtocol = configWsProtocol ? configWsProtocol === "wss" ? "https" : "http" : null;
   const serverProtocol = config.server.https ? "https" : "http";
   const protocol = clientProtocol ?? serverProtocol;
-  const configHmrHost = typeof config.server.hmr === "object" ? config.server.hmr.host : null;
+  const configWsHost = configHmrNet?.host ?? null;
   const userHost = typeof userConfig.server?.host === "string" ? userConfig.server.host : null;
   const configHost = typeof config.server.host === "string" ? config.server.host : null;
   const remoteHost = process.env.VITE_ALLOW_REMOTE && !userConfig.server?.host ? isIpv6(address) ? "[::1]" : "127.0.0.1" : null;
   const serverAddress = isIpv6(address) ? `[${address.address}]` : address.address;
-  let host = configHmrHost ?? userHost ?? remoteHost ?? configHost ?? serverAddress;
+  let host = configWsHost ?? userHost ?? remoteHost ?? configHost ?? serverAddress;
   if (host === "0.0.0.0") {
     host = "127.0.0.1";
   } else if (host === "::" || host === "[::]") {
     host = "[::1]";
   }
-  const userHmrClientPort = typeof userConfig.server?.hmr === "object" ? userConfig.server.hmr.clientPort : null;
-  const port = userHmrClientPort ?? address.port;
+  const userHmrNet = (typeof userConfig.server?.ws === "object" ? userConfig.server.ws : null) ?? (typeof userConfig.server?.hmr === "object" ? userConfig.server.hmr : null);
+  const userWsClientPort = userHmrNet?.clientPort ?? null;
+  const port = userWsClientPort ?? address.port;
   return `${protocol}://${host}:${port}`;
 }
 function isIpv6(address) {
-  return address.family === "IPv6" || // In node >=18.0 <18.4 this was an integer value. This was changed in a minor version.
-  // See: https://github.com/laravel/vite-plugin/issues/103
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-ignore-next-line
-  address.family === 6;
+  const family = address.family;
+  return family === "IPv6" || family === 6;
 }
 function noExternalInertiaHelpers(config) {
-  const userNoExternal = config.ssr?.noExternal;
+  const ssrConfig = typeof config.ssr === "object" && config.ssr !== null ? config.ssr : void 0;
+  const userNoExternal = ssrConfig?.noExternal;
   const pluginNoExternal = ["litestar-vite-plugin"];
   if (userNoExternal === true) {
     return true;
@@ -844,11 +778,10 @@ function resolveEnvironmentServerConfig(env) {
     throw Error(`Unable to determine the host from the environment's APP_URL: [${env.APP_URL}].`);
   }
   return {
-    hmr: { host },
     host,
     https: {
-      key: fs.readFileSync(env.VITE_DEV_SERVER_KEY),
-      cert: fs.readFileSync(env.VITE_DEV_SERVER_CERT)
+      key: fs.readFileSync(env.VITE_SERVER_KEY),
+      cert: fs.readFileSync(env.VITE_SERVER_CERT)
     }
   };
 }
@@ -877,7 +810,6 @@ function resolveDevelopmentEnvironmentServerConfig(host) {
     throw Error(`Unable to find certificate files for your host [${host}] in the [${configPath}/certs] directory.`);
   }
   return {
-    hmr: { host: resolvedHost },
     host: resolvedHost,
     https: {
       key: keyPath,
@@ -915,25 +847,40 @@ function dirname() {
   }
   return path.resolve(process.cwd(), "../dist/js");
 }
+let cachedDevServerPlaceholderCandidates;
+let cachedDevServerPlaceholderPath;
 function getDevServerPlaceholderCandidates() {
+  if (cachedDevServerPlaceholderCandidates) {
+    return cachedDevServerPlaceholderCandidates;
+  }
   const distJsRoot = "dist/js";
   const placeholderName = "dev-server-index.html";
   const moduleDir = dirname();
   const candidates = [
-    path.join(dirname(), placeholderName),
+    path.join(moduleDir, placeholderName),
     path.join(process.cwd(), distJsRoot, placeholderName),
     path.join(process.cwd(), "src", "js", distJsRoot, placeholderName),
     path.resolve(process.cwd(), "..", distJsRoot, placeholderName),
     path.join(moduleDir, distJsRoot, placeholderName)
   ];
-  return [...new Set(candidates)];
+  cachedDevServerPlaceholderCandidates = [...new Set(candidates)];
+  return cachedDevServerPlaceholderCandidates;
 }
 async function loadDevServerPlaceholder() {
+  if (cachedDevServerPlaceholderPath) {
+    try {
+      return await fs.promises.readFile(cachedDevServerPlaceholderPath, "utf-8");
+    } catch {
+      cachedDevServerPlaceholderPath = void 0;
+    }
+  }
   const candidates = getDevServerPlaceholderCandidates();
   let lastError = new Error("Failed to load dev server placeholder index.html");
   for (const candidatePath of candidates) {
     try {
-      return await fs.promises.readFile(candidatePath, "utf-8");
+      const content = await fs.promises.readFile(candidatePath, "utf-8");
+      cachedDevServerPlaceholderPath = candidatePath;
+      return content;
     } catch (error) {
       lastError = error;
     }

package/dist/js/inertia-helpers/index.d.ts

@@ -64,12 +64,16 @@ export declare function resolvePageComponent<T>(path: string | string[], pages:
  * Offset-based pagination props.
  *
  * Returned when a route returns Litestar's `OffsetPagination` type.
- * Contains items plus metadata for offset/limit pagination.
+ * Litestar-Vite flattens pagination metadata as top-level sibling props:
+ * the route prop contains the item array, and `total`, `limit`, and `offset`
+ * are emitted beside it.
  *
  * @example
  * ```ts
  * interface User { id: string; name: string }
- * const { items, total, limit, offset } = props.users as OffsetPaginationProps<User>
+ * type UsersPageProps = { users: User[] } & Omit<OffsetPaginationProps<User>, 'items'>
+ *
+ * const { users, total, limit, offset } = props as UsersPageProps
  * ```
  */
 export interface OffsetPaginationProps<T> {
@@ -86,12 +90,16 @@ export interface OffsetPaginationProps<T> {
  * Classic page-based pagination props.
  *
  * Returned when a route returns Litestar's `ClassicPagination` type.
- * Contains items plus metadata for page number pagination.
+ * Litestar-Vite flattens pagination metadata as top-level sibling props:
+ * the route prop contains the item array, and `currentPage`, `totalPages`,
+ * and `pageSize` are emitted beside it.
  *
  * @example
  * ```ts
  * interface Post { id: string; title: string }
- * const { items, currentPage, totalPages, pageSize } = props.posts as ClassicPaginationProps<Post>
+ * type PostsPageProps = { posts: Post[] } & Omit<ClassicPaginationProps<Post>, 'items'>
+ *
+ * const { posts, currentPage, totalPages, pageSize } = props as PostsPageProps
  * ```
  */
 export interface ClassicPaginationProps<T> {
@@ -108,12 +116,16 @@ export interface ClassicPaginationProps<T> {
  * Cursor-based pagination props.
  *
  * Used for cursor/keyset pagination, commonly with infinite scroll.
- * Contains items plus cursor tokens for navigation.
+ * Litestar-Vite flattens pagination metadata as top-level sibling props:
+ * the route prop contains the item array, and cursor metadata is emitted
+ * beside it.
  *
  * @example
  * ```ts
  * interface Message { id: string; content: string }
- * const { items, hasMore, nextCursor } = props.messages as CursorPaginationProps<Message>
+ * type MessagesPageProps = { messages: Message[] } & Omit<CursorPaginationProps<Message>, 'items'>
+ *
+ * const { messages, hasMore, nextCursor } = props as MessagesPageProps
  * if (hasMore && nextCursor) {
  *   // Fetch more with cursor
  * }
@@ -139,6 +151,11 @@ export interface CursorPaginationProps<T> {
  * Union type for any pagination props.
  *
  * Use when you need to handle multiple pagination styles.
+ * Because pagination metadata is flattened as sibling keys, two paginators in
+ * one response can collide on keys such as `total`, `limit`, `offset`,
+ * `currentPage`, or `pageSize`. Return one flattened paginator per response,
+ * or wrap additional paginators in explicit prop containers with distinct
+ * metadata.
  *
  * @example
  * ```ts
@@ -166,11 +183,12 @@ export type PaginationProps<T> = OffsetPaginationProps<T> | ClassicPaginationPro
  * import { usePage } from '@inertiajs/vue3'
  *
  * const page = usePage()
- * const scrollProps = page.props.scrollProps as ScrollProps
+ * const scrollProps = page.props.scrollProps as Record<string, ScrollProps> | undefined
+ * const postsScroll = scrollProps?.posts
  *
  * function loadMore() {
- *   if (scrollProps.nextPage) {
- *     router.get(url, { [scrollProps.pageName]: scrollProps.nextPage })
+ *   if (postsScroll?.nextPage) {
+ *     router.get(url, { [postsScroll.pageName]: postsScroll.nextPage })
  *   }
  * }
  * ```

package/dist/js/install-hint.d.ts

@@ -13,3 +13,20 @@ export declare function resolveInstallHint(pkg?: string): string;
  * @returns The full command string (e.g., "npx @hey-api/openapi-ts ..." or "bunx @hey-api/openapi-ts ...")
  */
 export declare function resolvePackageExecutor(pkg: string, executor?: string): string;
+/**
+ * Resolves the package executor command as argv.
+ *
+ * This is used for actual process execution so package arguments are never
+ * shell-joined. The string-returning ``resolvePackageExecutor`` remains the
+ * display/back-compat helper.
+ */
+export interface PackageExecutorArgvOptions {
+    /**
+     * Package spec to install for executors that support an explicit package
+     * separate from the command binary, e.g. npm exec --package.
+     */
+    packageSpec?: string;
+    /** Binary command exposed by packageSpec. */
+    binName?: string;
+}
+export declare function resolvePackageExecutorArgv(args: string[], executor?: string, options?: PackageExecutorArgvOptions): string[];

package/dist/js/install-hint.js

@@ -63,8 +63,42 @@ function resolvePackageExecutor(pkg, executor) {
       return `npx ${pkg}`;
   }
 }
+function getPackageNameFromSpec(packageSpec) {
+  if (packageSpec.startsWith("@")) {
+    const versionIndex2 = packageSpec.indexOf("@", packageSpec.indexOf("/") + 1);
+    return versionIndex2 === -1 ? packageSpec : packageSpec.slice(0, versionIndex2);
+  }
+  const versionIndex = packageSpec.indexOf("@");
+  return versionIndex === -1 ? packageSpec : packageSpec.slice(0, versionIndex);
+}
+function resolveDenoPackageSpec(packageSpec, binName) {
+  if (!binName) return packageSpec;
+  const packageName = getPackageNameFromSpec(packageSpec);
+  const defaultBinName = packageName.split("/").pop();
+  return defaultBinName === binName ? packageSpec : `${packageSpec}/${binName}`;
+}
+function resolvePackageExecutorArgv(args, executor, options = {}) {
+  const runtime = executor || detectExecutor();
+  const { packageSpec, binName } = options;
+  switch (runtime) {
+    case "bun":
+      return ["bunx", ...packageSpec ? [packageSpec, ...args] : args];
+    case "deno":
+      return ["deno", "run", "-A", ...packageSpec ? [`npm:${resolveDenoPackageSpec(packageSpec, binName)}`, ...args] : args];
+    case "pnpm":
+      return ["pnpm", "dlx", ...packageSpec ? [packageSpec, ...args] : args];
+    case "yarn":
+      return ["yarn", "dlx", ...packageSpec ? [packageSpec, ...args] : args];
+    default:
+      if (packageSpec && binName) {
+        return ["npm", "exec", "--yes", "--package", packageSpec, "--", binName, ...args];
+      }
+      return ["npx", ...args];
+  }
+}
 export {
   detectExecutor,
   resolveInstallHint,
-  resolvePackageExecutor
+  resolvePackageExecutor,
+  resolvePackageExecutorArgv
 };

package/dist/js/nuxt.d.ts

@@ -100,6 +100,12 @@ export interface NuxtTypesConfig {
      * @default false
      */
     globalRoute?: boolean;
+    /**
+     * Fail Vite when type generation fails.
+     *
+     * Defaults to true during build and false during dev.
+     */
+    failOnError?: boolean;
     /**
      * Debounce time in milliseconds for type regeneration.
      *

package/dist/js/nuxt.js

@@ -2,9 +2,9 @@ import fs from "node:fs";
 import path from "node:path";
 import colors from "picocolors";
 import { readBridgeConfig } from "./shared/bridge-schema.js";
-import { DEBOUNCE_MS } from "./shared/constants.js";
 import { normalizeHost, resolveHotFilePath, resolveLitestarPort } from "./shared/network.js";
-import { createLitestarTypeGenPlugin } from "./shared/typegen-plugin.js";
+import { createLitestarTypeGenPlugin, resolveTypesConfig } from "./shared/typegen-plugin.js";
+import { hmrServerConfig } from "./shared/vite-compat.js";
 function resolveConfig(config = {}) {
   let hotFile;
   let proxyMode = "vite";
@@ -38,74 +38,13 @@ function resolveConfig(config = {}) {
   if (resolvedLitestarPort !== null) {
     litestarPort = resolvedLitestarPort;
   }
-  let typesConfig = false;
-  const defaultTypesOutput = "generated";
-  const buildTypeDefaults = (output) => ({
-    openapiPath: path.join(output, "openapi.json"),
-    routesPath: path.join(output, "routes.json"),
-    pagePropsPath: path.join(output, "inertia-pages.json"),
-    schemasTsPath: path.join(output, "schemas.ts")
+  const typesConfig = resolveTypesConfig({
+    requested: config.types,
+    pythonConfig: pythonTypesConfig ?? void 0,
+    defaultOutput: "generated",
+    mergePythonWhenTrue: true,
+    mergePythonForObject: true
   });
-  if (config.types === true) {
-    const output = pythonTypesConfig?.output ?? defaultTypesOutput;
-    const defaults = buildTypeDefaults(output);
-    typesConfig = {
-      enabled: true,
-      output,
-      openapiPath: pythonTypesConfig?.openapiPath ?? defaults.openapiPath,
-      routesPath: pythonTypesConfig?.routesPath ?? defaults.routesPath,
-      pagePropsPath: pythonTypesConfig?.pagePropsPath ?? defaults.pagePropsPath,
-      schemasTsPath: pythonTypesConfig?.schemasTsPath ?? defaults.schemasTsPath,
-      generateZod: pythonTypesConfig?.generateZod ?? false,
-      generateSdk: pythonTypesConfig?.generateSdk ?? true,
-      generateRoutes: pythonTypesConfig?.generateRoutes ?? true,
-      generatePageProps: pythonTypesConfig?.generatePageProps ?? true,
-      generateSchemas: pythonTypesConfig?.generateSchemas ?? true,
-      globalRoute: pythonTypesConfig?.globalRoute ?? false,
-      debounce: DEBOUNCE_MS
-    };
-  } else if (typeof config.types === "object" && config.types !== null) {
-    const userProvidedOutput = Object.hasOwn(config.types, "output");
-    const output = config.types.output ?? pythonTypesConfig?.output ?? defaultTypesOutput;
-    const defaults = buildTypeDefaults(output);
-    const openapiFallback = userProvidedOutput ? defaults.openapiPath : pythonTypesConfig?.openapiPath ?? defaults.openapiPath;
-    const routesFallback = userProvidedOutput ? defaults.routesPath : pythonTypesConfig?.routesPath ?? defaults.routesPath;
-    const pagePropsFallback = userProvidedOutput ? defaults.pagePropsPath : pythonTypesConfig?.pagePropsPath ?? defaults.pagePropsPath;
-    const schemasFallback = userProvidedOutput ? defaults.schemasTsPath : pythonTypesConfig?.schemasTsPath ?? defaults.schemasTsPath;
-    typesConfig = {
-      enabled: config.types.enabled ?? true,
-      output,
-      openapiPath: config.types.openapiPath ?? openapiFallback,
-      routesPath: config.types.routesPath ?? routesFallback,
-      pagePropsPath: config.types.pagePropsPath ?? pagePropsFallback,
-      schemasTsPath: config.types.schemasTsPath ?? schemasFallback,
-      generateZod: config.types.generateZod ?? pythonTypesConfig?.generateZod ?? false,
-      generateSdk: config.types.generateSdk ?? pythonTypesConfig?.generateSdk ?? true,
-      generateRoutes: config.types.generateRoutes ?? pythonTypesConfig?.generateRoutes ?? true,
-      generatePageProps: config.types.generatePageProps ?? pythonTypesConfig?.generatePageProps ?? true,
-      generateSchemas: config.types.generateSchemas ?? pythonTypesConfig?.generateSchemas ?? true,
-      globalRoute: config.types.globalRoute ?? pythonTypesConfig?.globalRoute ?? false,
-      debounce: config.types.debounce ?? DEBOUNCE_MS
-    };
-  } else if (config.types !== false && pythonTypesConfig?.enabled) {
-    const output = pythonTypesConfig.output ?? defaultTypesOutput;
-    const defaults = buildTypeDefaults(output);
-    typesConfig = {
-      enabled: true,
-      output,
-      openapiPath: pythonTypesConfig.openapiPath ?? defaults.openapiPath,
-      routesPath: pythonTypesConfig.routesPath ?? defaults.routesPath,
-      pagePropsPath: pythonTypesConfig.pagePropsPath ?? defaults.pagePropsPath,
-      schemasTsPath: pythonTypesConfig.schemasTsPath ?? defaults.schemasTsPath,
-      generateZod: pythonTypesConfig.generateZod ?? false,
-      generateSdk: pythonTypesConfig.generateSdk ?? true,
-      generateRoutes: pythonTypesConfig.generateRoutes ?? true,
-      generatePageProps: pythonTypesConfig.generatePageProps ?? true,
-      generateSchemas: pythonTypesConfig.generateSchemas ?? true,
-      globalRoute: pythonTypesConfig.globalRoute ?? false,
-      debounce: DEBOUNCE_MS
-    };
-  }
   return {
     apiProxy: config.apiProxy ?? "http://localhost:8000",
     apiPrefix: config.apiPrefix ?? "/api",
@@ -154,13 +93,14 @@ function createProxyPlugin(config) {
             strictPort: true
           } : {},
           // Vite serves HMR on a separate internal port; browsers reach it through
-          // Litestar's /static/vite-hmr WebSocket handler.
-          hmr: {
+          // Litestar's /static/vite-hmr WebSocket handler. Vite 8.1 moved these network
+          // options from server.hmr.* to server.ws.*; hmrServerConfig picks the right key.
+          ...hmrServerConfig({
             port: hmrPort,
             host: "127.0.0.1",
             ...browserHmrPort !== void 0 ? { clientPort: browserHmrPort } : {},
             ...config.litestarPort !== void 0 ? { path: hmrPath, protocol: "ws" } : {}
-          }
+          })
         }
       };
     },

package/dist/js/shared/bridge-schema.d.ts

@@ -25,6 +25,7 @@ export interface BridgeTypesConfig {
     generatePageProps: boolean;
     generateSchemas: boolean;
     globalRoute: boolean;
+    failOnError?: boolean;
 }
 export interface BridgeSpaConfig {
     /** Use script element instead of data-page attribute for Inertia page data */