@mdream/vite 0.12.1 → 0.12.2

package/dist/index.d.mts

@@ -5,7 +5,7 @@ import { Plugin } from "vite";
 interface ViteHtmlToMarkdownOptions {
   /**
    * Glob patterns to include HTML files for processing
-   * @default ['**\/*.html']
+   * @default ['*.html', '**\/*.html']
    */
   include?: string[];
   /**
@@ -27,18 +27,13 @@ interface ViteHtmlToMarkdownOptions {
    * Options to pass to mdream's htmlToMarkdown function
    */
   mdreamOptions?: HTMLToMarkdownOptions;
-  /**
-   * Whether to preserve directory structure in output
-   * @default true
-   */
-  preserveStructure?: boolean;
   /**
    * Custom cache TTL in milliseconds for production
    * @default 3600000 (1 hour)
    */
   cacheTTL?: number;
   /**
-   * Whether to log conversion activities
+   * Enable verbose logging for debugging
    * @default false
    */
   verbose?: boolean;

package/dist/index.mjs

@@ -4,14 +4,13 @@ import { htmlToMarkdown } from "mdream";
 
 //#region src/plugin.ts
 const DEFAULT_OPTIONS = {
-	include: ["**/*.html"],
+	include: ["*.html", "**/*.html"],
 	exclude: ["**/node_modules/**"],
 	outputDir: "",
 	cacheEnabled: true,
 	mdreamOptions: {},
-	preserveStructure: true,
 	cacheTTL: 36e5,
-	verbose: true
+	verbose: false
 };
 function viteHtmlToMarkdownPlugin(userOptions = {}) {
 	const options = {
@@ -109,46 +108,53 @@ function viteHtmlToMarkdownPlugin(userOptions = {}) {
 		});
 	}
 	function shouldServeMarkdown(acceptHeader, secFetchDest) {
-		const accept = acceptHeader || "";
 		if (secFetchDest === "document") return false;
-		if (accept.includes("text/html")) return false;
-		return accept.includes("*/*") || accept.includes("text/markdown");
+		const accept = acceptHeader || "";
+		const hasHtml = accept.includes("text/html");
+		if (hasHtml) return false;
+		const hasWildcard = accept.includes("*/*");
+		return hasWildcard || accept.includes("text/markdown");
+	}
+	function createMarkdownMiddleware(getServer, getOutDir, cacheControl) {
+		return async (req, res, next) => {
+			const path$1 = new URL(req.url || "", "http://localhost").pathname;
+			const hasMarkdownExtension = path$1.endsWith(".md");
+			const clientPrefersMarkdown = shouldServeMarkdown(req.headers.accept, req.headers["sec-fetch-dest"]);
+			if (path$1.startsWith("/api") || path$1.startsWith("/_") || path$1.endsWith(".html")) return next();
+			if (!hasMarkdownExtension && !clientPrefersMarkdown) return next();
+			const url = req.url;
+			try {
+				const result = await handleMarkdownRequest(url, getServer(), getOutDir());
+				res.setHeader("Content-Type", "text/markdown; charset=utf-8");
+				res.setHeader("Cache-Control", cacheControl);
+				res.setHeader("X-Markdown-Source", result.source);
+				res.setHeader("X-Markdown-Cached", result.cached.toString());
+				res.end(result.content);
+				log(`Served ${url} from ${result.source} (cached: ${result.cached})`);
+			} catch (error) {
+				const message = error instanceof Error ? error.message : String(error);
+				log(`Error serving ${url}: ${message}`);
+				res.statusCode = 404;
+				res.end(`HTML content not found for ${url}`);
+			}
+		};
 	}
 	return {
 		name: "vite-html-to-markdown",
 		configureServer(server) {
-			server.middlewares.use(async (req, res, next) => {
-				const hasMarkdownExtension = req.url?.endsWith(".md");
-				const clientPrefersMarkdown = shouldServeMarkdown(req.headers.accept, req.headers["sec-fetch-dest"]);
-				if (!hasMarkdownExtension && !clientPrefersMarkdown) return next();
-				const url = hasMarkdownExtension ? req.url : req.url;
-				try {
-					const result = await handleMarkdownRequest(url, server);
-					res.setHeader("Content-Type", "text/markdown; charset=utf-8");
-					res.setHeader("Cache-Control", "no-cache");
-					res.setHeader("X-Markdown-Source", result.source);
-					res.setHeader("X-Markdown-Cached", result.cached.toString());
-					res.end(result.content);
-					log(`Served ${url} from ${result.source} (cached: ${result.cached})`);
-				} catch (error) {
-					const message = error instanceof Error ? error.message : String(error);
-					log(`Error serving ${url}: ${message}`);
-					res.statusCode = 404;
-					res.end(`HTML content not found for ${url}`);
-				}
-			});
+			server.middlewares.use(createMarkdownMiddleware(() => server, () => void 0, "no-cache"));
 		},
-		generateBundle(outputOptions, bundle) {
+		generateBundle(_outputOptions, bundle) {
 			const htmlFiles = Object.entries(bundle).filter(([fileName, file]) => {
 				return fileName.endsWith(".html") && file.type === "asset" && matchesPattern(fileName, options.include) && !matchesPattern(fileName, options.exclude);
 			});
-			log(`Processing ${htmlFiles.length} HTML files for markdown generation`);
+			if (htmlFiles.length > 0) log(`Processing ${htmlFiles.length} HTML files for markdown generation`);
 			for (const [fileName, htmlFile] of htmlFiles) try {
 				if (htmlFile.type !== "asset" || !("source" in htmlFile)) continue;
 				const htmlContent = htmlFile.source;
 				const markdownContent = htmlToMarkdown(htmlContent, options.mdreamOptions);
 				const markdownFileName = fileName.replace(".html", ".md");
-				const outputPath = options.preserveStructure ? `${options.outputDir}/${markdownFileName}` : `${options.outputDir}/${path.basename(markdownFileName)}`;
+				const outputPath = options.outputDir ? `${options.outputDir}/${markdownFileName}` : markdownFileName;
 				this.emitFile({
 					type: "asset",
 					fileName: outputPath,
@@ -161,27 +167,7 @@ function viteHtmlToMarkdownPlugin(userOptions = {}) {
 			}
 		},
 		configurePreviewServer(server) {
-			server.middlewares.use(async (req, res, next) => {
-				const hasMarkdownExtension = req.url?.endsWith(".md");
-				const clientPrefersMarkdown = shouldServeMarkdown(req.headers.accept, req.headers["sec-fetch-dest"]);
-				if (!hasMarkdownExtension && !clientPrefersMarkdown) return next();
-				const url = hasMarkdownExtension ? req.url : req.url;
-				try {
-					const outDir = server.config.build?.outDir || "dist";
-					const result = await handleMarkdownRequest(url, null, outDir);
-					res.setHeader("Content-Type", "text/markdown; charset=utf-8");
-					res.setHeader("Cache-Control", "public, max-age=3600");
-					res.setHeader("X-Markdown-Source", result.source);
-					res.setHeader("X-Markdown-Cached", result.cached.toString());
-					res.end(result.content);
-					log(`Served ${url} from ${result.source} (cached: ${result.cached})`);
-				} catch (error) {
-					const message = error instanceof Error ? error.message : String(error);
-					log(`Error in preview server for ${url}: ${message}`);
-					res.statusCode = 404;
-					res.end(`HTML content not found for ${url}`);
-				}
-			});
+			server.middlewares.use(createMarkdownMiddleware(() => null, () => server.config.build?.outDir || "dist", "public, max-age=3600"));
 		}
 	};
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mdream/vite",
   "type": "module",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "description": "Vite plugin for HTML to Markdown conversion with on-demand generation",
   "author": {
     "name": "Harlan Wilton",
@@ -43,7 +43,7 @@
     "vite": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
   },
   "dependencies": {
-    "mdream": "0.12.1"
+    "mdream": "0.12.2"
   },
   "devDependencies": {
     "@types/node": "^24.6.2",