defuss-ssg 0.6.1 → 0.6.2

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { v as validateProjectDir, b as build } from './vite-DLXcqaZX.mjs';
-import { d as dev, s as serve } from './serve-DIW2gbz_.mjs';
+import { v as validateProjectDir, b as build } from './vite-DdJcWQGP.mjs';
+import { d as dev, s as serve } from './serve-CTYzPwKQ.mjs';
 import { join, dirname, resolve } from 'node:path';
 import { existsSync, readFileSync } from 'node:fs';
 import { spawn } from 'node:child_process';
@@ -11,6 +11,7 @@ import 'node:crypto';
 import '@mdx-js/rollup';
 import 'vite';
 import 'defuss-vite';
+import 'node:module';
 import 'node:url';
 import 'node:os';
 import 'esbuild';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var vite = require('./vite-DlnPNJYO.cjs');
+var vite = require('./vite-CkpguLfK.cjs');
 var mdx = require('@mdx-js/rollup');
 var vite$1 = require('vite');
 var defuss = require('defuss-vite');
@@ -11,6 +11,7 @@ require('fast-glob');
 require('node:fs/promises');
 require('defuss/server');
 require('node:crypto');
+require('node:module');
 require('node:url');
 require('node:os');
 require('esbuild');

package/dist/index.mjs

@@ -1,5 +1,5 @@
-export { H as HTTP_METHODS, b as build, a as buildEndpoints, c as compileEndpoints, d as compileRpcModule, e as configDefaults, f as defussSsg, g as discoverEndpointSourceFiles, h as discoverRpcFile, i as endpointFileToRoute, j as handleEndpointRoute, k as handleRpcRequest, l as initializeRpc, m as loadEndpointModule, n as matchRoutePattern, r as readConfig, o as registerEndpoints, p as resolveEndpoints, q as routeToExpressPattern } from './vite-DLXcqaZX.mjs';
-export { d as dev, s as serve } from './serve-DIW2gbz_.mjs';
+export { H as HTTP_METHODS, b as build, a as buildEndpoints, c as compileEndpoints, d as compileRpcModule, e as configDefaults, f as defussSsg, g as discoverEndpointSourceFiles, h as discoverRpcFile, i as endpointFileToRoute, j as handleEndpointRoute, k as handleRpcRequest, l as initializeRpc, m as loadEndpointModule, n as matchRoutePattern, r as readConfig, o as registerEndpoints, p as resolveEndpoints, q as routeToExpressPattern } from './vite-DdJcWQGP.mjs';
+export { d as dev, s as serve } from './serve-CTYzPwKQ.mjs';
 import 'fast-glob';
 import 'node:fs';
 import 'node:fs/promises';
@@ -9,6 +9,7 @@ import 'node:crypto';
 import '@mdx-js/rollup';
 import 'vite';
 import 'defuss-vite';
+import 'node:module';
 import 'node:url';
 import 'node:os';
 import 'esbuild';

package/dist/runtime.cjs

@@ -7,6 +7,22 @@ const setupLiveReload = () => {
 };
 const runtimeWindow = window;
 const pageCache = runtimeWindow.__defuss_pageCache ?? /* @__PURE__ */ new Map();
+const isHydratableComponent = (value) => typeof value === "function";
+const pickHydrationComponent = (moduleExports, preferredExportName) => {
+  if (isHydratableComponent(moduleExports.default)) {
+    return moduleExports.default;
+  }
+  if (preferredExportName && isHydratableComponent(moduleExports[preferredExportName])) {
+    return moduleExports[preferredExportName];
+  }
+  const functionExports = Object.entries(moduleExports).filter(
+    ([key, value]) => key !== "default" && isHydratableComponent(value)
+  );
+  if (functionExports.length === 1) {
+    return functionExports[0][1];
+  }
+  return null;
+};
 const HYDRATION_ATTRIBUTE_NAMES = [
   "data-hydrate-id",
   "data-hydrate",
@@ -514,6 +530,7 @@ const hydrateBoundary = async (boundary, options = {}) => {
     return;
   }
   const id = boundary.getAttribute("data-hydrate-id");
+  const exportName = boundary.getAttribute("data-hydrate-export");
   const src = boundary.getAttribute("data-hydrate-src");
   const propsStr = boundary.getAttribute("data-hydrate-props");
   const runtimeUrl = boundary.getAttribute("data-hydrate-runtime");
@@ -530,15 +547,20 @@ const hydrateBoundary = async (boundary, options = {}) => {
       /* @vite-ignore */
       `${runtimeUrl}${cacheBust}`
     );
-    const exports$1 = await import(
+    const moduleExports = await import(
       /* @vite-ignore */
       `${src}${cacheBust}`
     );
-    if (!exports$1 || typeof exports$1.default !== "function") {
-      console.error(`[hydrate:${id}] No default export in ${src}`);
+    const Component = pickHydrationComponent(
+      moduleExports,
+      exportName
+    );
+    if (!Component) {
+      console.error(
+        `[hydrate:${id}] No hydratable export in ${src}${exportName ? ` (expected ${exportName})` : ""}`
+      );
       return;
     }
-    const Component = exports$1.default;
     const props = JSON.parse(propsStr);
     console.log(
       `[hydrate:${id}] Rendering component ${Component.name || "(anon)"} with props:`,

package/dist/runtime.mjs

@@ -5,6 +5,22 @@ const setupLiveReload = () => {
 };
 const runtimeWindow = window;
 const pageCache = runtimeWindow.__defuss_pageCache ?? /* @__PURE__ */ new Map();
+const isHydratableComponent = (value) => typeof value === "function";
+const pickHydrationComponent = (moduleExports, preferredExportName) => {
+  if (isHydratableComponent(moduleExports.default)) {
+    return moduleExports.default;
+  }
+  if (preferredExportName && isHydratableComponent(moduleExports[preferredExportName])) {
+    return moduleExports[preferredExportName];
+  }
+  const functionExports = Object.entries(moduleExports).filter(
+    ([key, value]) => key !== "default" && isHydratableComponent(value)
+  );
+  if (functionExports.length === 1) {
+    return functionExports[0][1];
+  }
+  return null;
+};
 const HYDRATION_ATTRIBUTE_NAMES = [
   "data-hydrate-id",
   "data-hydrate",
@@ -512,6 +528,7 @@ const hydrateBoundary = async (boundary, options = {}) => {
     return;
   }
   const id = boundary.getAttribute("data-hydrate-id");
+  const exportName = boundary.getAttribute("data-hydrate-export");
   const src = boundary.getAttribute("data-hydrate-src");
   const propsStr = boundary.getAttribute("data-hydrate-props");
   const runtimeUrl = boundary.getAttribute("data-hydrate-runtime");
@@ -528,15 +545,20 @@ const hydrateBoundary = async (boundary, options = {}) => {
       /* @vite-ignore */
       `${runtimeUrl}${cacheBust}`
     );
-    const exports$1 = await import(
+    const moduleExports = await import(
       /* @vite-ignore */
       `${src}${cacheBust}`
     );
-    if (!exports$1 || typeof exports$1.default !== "function") {
-      console.error(`[hydrate:${id}] No default export in ${src}`);
+    const Component = pickHydrationComponent(
+      moduleExports,
+      exportName
+    );
+    if (!Component) {
+      console.error(
+        `[hydrate:${id}] No hydratable export in ${src}${exportName ? ` (expected ${exportName})` : ""}`
+      );
       return;
     }
-    const Component = exports$1.default;
     const props = JSON.parse(propsStr);
     console.log(
       `[hydrate:${id}] Rendering component ${Component.name || "(anon)"} with props:`,

package/dist/{serve-DIW2gbz_.mjs → serve-CTYzPwKQ.mjs}

@@ -1,7 +1,7 @@
 import mdx from '@mdx-js/rollup';
 import { createServer } from 'vite';
 import defuss from 'defuss-vite';
-import { v as validateProjectDir, r as readConfig, f as defussSsg, o as registerEndpoints, l as initializeRpc, s as readIncomingBody, t as createWebRequest, k as handleRpcRequest, u as sendWebResponse } from './vite-DLXcqaZX.mjs';
+import { v as validateProjectDir, r as readConfig, f as defussSsg, o as registerEndpoints, l as initializeRpc, s as readIncomingBody, t as createWebRequest, k as handleRpcRequest, u as sendWebResponse } from './vite-DdJcWQGP.mjs';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 import { express, startServer } from 'defuss-express';

package/dist/{vite-DlnPNJYO.cjs → vite-CkpguLfK.cjs}

@@ -9,6 +9,7 @@ var node_crypto = require('node:crypto');
 var mdx = require('@mdx-js/rollup');
 var vite = require('vite');
 var defuss = require('defuss-vite');
+var node_module = require('node:module');
 var node_url = require('node:url');
 var node_os = require('node:os');
 var esbuild = require('esbuild');
@@ -78,6 +79,13 @@ const toStableHydrateId = (seed) => {
   const digest = node_crypto.createHash("sha1").update(seed).digest("hex").slice(0, 12);
   return `dh_${digest}`;
 };
+const toPascalCase = (value) => value.split(/[^A-Za-z0-9]+/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
+const toComponentExportName = (componentFilePath) => {
+  const extension = node_path.extname(componentFilePath);
+  const fileStem = node_path.basename(componentFilePath, extension);
+  const exportBaseName = fileStem.toLowerCase() === "index" ? node_path.basename(node_path.dirname(componentFilePath)) : fileStem;
+  return toPascalCase(exportBaseName);
+};
 function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeOutputHtmlFilePath) {
   const componentsRoot = node_path.resolve(componentsDir);
   let hydrateIndex = 0;
@@ -93,6 +101,9 @@ function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeO
       if (vnode.sourceInfo && typeof vnode.sourceInfo === "object" && typeof vnode.sourceInfo.fileName === "string" && vnode.sourceInfo.fileName.includes(componentsDir) && vnode.type !== "script" && vnode.type !== "head" && vnode.type !== "link" && vnode.type !== "meta" && vnode.type !== "title") {
         const sourceFile = node_path.resolve(vnode.sourceInfo.fileName);
         const relativeComponentPath = node_path.relative(componentsRoot, sourceFile);
+        const componentExportName = toComponentExportName(
+          relativeComponentPath
+        );
         if (relativeComponentPath.startsWith("..") || relativeComponentPath.length === 0) {
           throw new Error(
             `[auto-hydrate] Component source file is outside the components directory: ${sourceFile}`
@@ -126,6 +137,7 @@ function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeO
           attributes: {
             "data-hydrate-id": id,
             "data-hydrate": "true",
+            "data-hydrate-export": componentExportName,
             "data-hydrate-src": clientSrcFile,
             "data-hydrate-props": JSON.stringify(componentProps),
             "data-hydrate-runtime": `/${componentsPublicPrefix}/runtime.js`
@@ -643,7 +655,7 @@ const registerEndpoints = async (registrar, projectDir, _config, debug = false)
   }
 };
 
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite-DlnPNJYO.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite-CkpguLfK.cjs', document.baseURI).href)));
 const __dirname$1 = node_path.dirname(__filename$1);
 const isHtmlLikePageSource = (filePath) => {
   const extension = node_path.extname(filePath).toLowerCase();
@@ -669,6 +681,30 @@ const resolveLocalHelperFile = (sourceRelativePath, builtRelativePath) => {
   }
   return node_path.resolve(__dirname$1, builtRelativePath);
 };
+const loadProjectTailwindVitePlugins = async (projectDir, debug) => {
+  const requireFromBuild = node_module.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('vite-CkpguLfK.cjs', document.baseURI).href)));
+  try {
+    const resolvedPluginPath = requireFromBuild.resolve("@tailwindcss/vite", {
+      paths: [projectDir]
+    });
+    const tailwindModule = await import(node_url.pathToFileURL(resolvedPluginPath).href);
+    if (typeof tailwindModule.default !== "function") {
+      return [];
+    }
+    const plugin = tailwindModule.default();
+    if (!plugin) {
+      return [];
+    }
+    return Array.isArray(plugin) ? plugin : [plugin];
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const isMissingPlugin = message.includes("@tailwindcss/vite");
+    if (!isMissingPlugin && debug) {
+      console.warn("[build] Failed to load @tailwindcss/vite from project:", error);
+    }
+    return [];
+  }
+};
 const injectStylesheetLinks$1 = (html, hrefs) => {
   const missingHrefs = hrefs.filter((href) => !html.includes(`href="${href}"`));
   if (missingHrefs.length === 0) {
@@ -680,6 +716,29 @@ const injectStylesheetLinks$1 = (html, hrefs) => {
   }
   return `${linkTags}${html}`;
 };
+const normalizeComponentStylesheet = (css) => {
+  const compiledTailwindBanner = "/*! tailwindcss";
+  const compiledTailwindIndex = css.indexOf(compiledTailwindBanner);
+  if (compiledTailwindIndex <= 0) {
+    return css;
+  }
+  const prefix = css.slice(0, compiledTailwindIndex).trimStart();
+  const hasRawTailwindPrelude = prefix.startsWith("@layer theme, base, components, utilities;") && prefix.includes("@theme default");
+  if (!hasRawTailwindPrelude) {
+    return css;
+  }
+  return css.slice(compiledTailwindIndex);
+};
+const normalizeComponentStylesheets = async (componentsOutputDir) => {
+  const cssFiles = await glob.async(node_path.join(componentsOutputDir, "**/*.css"));
+  for (const cssFile of cssFiles) {
+    const currentCss = await promises.readFile(cssFile, "utf-8");
+    const normalizedCss = normalizeComponentStylesheet(currentCss);
+    if (normalizedCss !== currentCss) {
+      await promises.writeFile(cssFile, normalizedCss);
+    }
+  }
+};
 const getComponentStylesheetHrefs$1 = async (componentsOutputDir, componentsPublicDir) => {
   if (!node_fs.existsSync(componentsOutputDir)) {
     return [];
@@ -1059,11 +1118,15 @@ const build = async ({
         node_path.resolve(entryFile)
       ])
     );
+    const componentBuildPlugins = [
+      defuss(),
+      ...await loadProjectTailwindVitePlugins(projectDir, debug)
+    ];
     await vite.build({
       root: node_path.resolve(tmpComponentsDir),
       configFile: false,
       publicDir: false,
-      plugins: [defuss()],
+      plugins: componentBuildPlugins,
       build: {
         lib: {
           entry: componentEntries,
@@ -1081,6 +1144,7 @@ const build = async ({
         }
       }
     });
+    await normalizeComponentStylesheets(tmpComponentOutDir);
     timeEndDebug("[build] vite-components");
   }
   if (isFullBuild || changeKind === "page" || changeKind === "endpoint") {

package/dist/{vite-DLXcqaZX.mjs → vite-DdJcWQGP.mjs}

@@ -1,13 +1,14 @@
 import glob from 'fast-glob';
 import { existsSync, statSync, mkdirSync, rmSync, readdirSync, symlinkSync } from 'node:fs';
 import { writeFile, readFile, cp, stat } from 'node:fs/promises';
-import { join, resolve, relative, sep, extname, dirname } from 'node:path';
+import { join, resolve, relative, sep, extname, basename, dirname } from 'node:path';
 import { getBrowserGlobals, getDocument, renderSync, renderToString } from 'defuss/server';
 import { createHash } from 'node:crypto';
 import mdx from '@mdx-js/rollup';
 import { createServer, build as build$1 } from 'vite';
 import defuss from 'defuss-vite';
-import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import { tmpdir } from 'node:os';
 import esbuild from 'esbuild';
 import rehypeKatex from 'rehype-katex';
@@ -75,6 +76,13 @@ const toStableHydrateId = (seed) => {
   const digest = createHash("sha1").update(seed).digest("hex").slice(0, 12);
   return `dh_${digest}`;
 };
+const toPascalCase = (value) => value.split(/[^A-Za-z0-9]+/).filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
+const toComponentExportName = (componentFilePath) => {
+  const extension = extname(componentFilePath);
+  const fileStem = basename(componentFilePath, extension);
+  const exportBaseName = fileStem.toLowerCase() === "index" ? basename(dirname(componentFilePath)) : fileStem;
+  return toPascalCase(exportBaseName);
+};
 function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeOutputHtmlFilePath) {
   const componentsRoot = resolve(componentsDir);
   let hydrateIndex = 0;
@@ -90,6 +98,9 @@ function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeO
       if (vnode.sourceInfo && typeof vnode.sourceInfo === "object" && typeof vnode.sourceInfo.fileName === "string" && vnode.sourceInfo.fileName.includes(componentsDir) && vnode.type !== "script" && vnode.type !== "head" && vnode.type !== "link" && vnode.type !== "meta" && vnode.type !== "title") {
         const sourceFile = resolve(vnode.sourceInfo.fileName);
         const relativeComponentPath = relative(componentsRoot, sourceFile);
+        const componentExportName = toComponentExportName(
+          relativeComponentPath
+        );
         if (relativeComponentPath.startsWith("..") || relativeComponentPath.length === 0) {
           throw new Error(
             `[auto-hydrate] Component source file is outside the components directory: ${sourceFile}`
@@ -123,6 +134,7 @@ function applyAutoHydrate(vdom, componentsDir, componentsPublicPrefix, relativeO
           attributes: {
             "data-hydrate-id": id,
             "data-hydrate": "true",
+            "data-hydrate-export": componentExportName,
             "data-hydrate-src": clientSrcFile,
             "data-hydrate-props": JSON.stringify(componentProps),
             "data-hydrate-runtime": `/${componentsPublicPrefix}/runtime.js`
@@ -666,6 +678,30 @@ const resolveLocalHelperFile = (sourceRelativePath, builtRelativePath) => {
   }
   return resolve(__dirname$1, builtRelativePath);
 };
+const loadProjectTailwindVitePlugins = async (projectDir, debug) => {
+  const requireFromBuild = createRequire(import.meta.url);
+  try {
+    const resolvedPluginPath = requireFromBuild.resolve("@tailwindcss/vite", {
+      paths: [projectDir]
+    });
+    const tailwindModule = await import(pathToFileURL(resolvedPluginPath).href);
+    if (typeof tailwindModule.default !== "function") {
+      return [];
+    }
+    const plugin = tailwindModule.default();
+    if (!plugin) {
+      return [];
+    }
+    return Array.isArray(plugin) ? plugin : [plugin];
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    const isMissingPlugin = message.includes("@tailwindcss/vite");
+    if (!isMissingPlugin && debug) {
+      console.warn("[build] Failed to load @tailwindcss/vite from project:", error);
+    }
+    return [];
+  }
+};
 const injectStylesheetLinks$1 = (html, hrefs) => {
   const missingHrefs = hrefs.filter((href) => !html.includes(`href="${href}"`));
   if (missingHrefs.length === 0) {
@@ -677,6 +713,29 @@ const injectStylesheetLinks$1 = (html, hrefs) => {
   }
   return `${linkTags}${html}`;
 };
+const normalizeComponentStylesheet = (css) => {
+  const compiledTailwindBanner = "/*! tailwindcss";
+  const compiledTailwindIndex = css.indexOf(compiledTailwindBanner);
+  if (compiledTailwindIndex <= 0) {
+    return css;
+  }
+  const prefix = css.slice(0, compiledTailwindIndex).trimStart();
+  const hasRawTailwindPrelude = prefix.startsWith("@layer theme, base, components, utilities;") && prefix.includes("@theme default");
+  if (!hasRawTailwindPrelude) {
+    return css;
+  }
+  return css.slice(compiledTailwindIndex);
+};
+const normalizeComponentStylesheets = async (componentsOutputDir) => {
+  const cssFiles = await glob.async(join(componentsOutputDir, "**/*.css"));
+  for (const cssFile of cssFiles) {
+    const currentCss = await readFile(cssFile, "utf-8");
+    const normalizedCss = normalizeComponentStylesheet(currentCss);
+    if (normalizedCss !== currentCss) {
+      await writeFile(cssFile, normalizedCss);
+    }
+  }
+};
 const getComponentStylesheetHrefs$1 = async (componentsOutputDir, componentsPublicDir) => {
   if (!existsSync(componentsOutputDir)) {
     return [];
@@ -1056,11 +1115,15 @@ const build = async ({
         resolve(entryFile)
       ])
     );
+    const componentBuildPlugins = [
+      defuss(),
+      ...await loadProjectTailwindVitePlugins(projectDir, debug)
+    ];
     await build$1({
       root: resolve(tmpComponentsDir),
       configFile: false,
       publicDir: false,
-      plugins: [defuss()],
+      plugins: componentBuildPlugins,
       build: {
         lib: {
           entry: componentEntries,
@@ -1078,6 +1141,7 @@ const build = async ({
         }
       }
     });
+    await normalizeComponentStylesheets(tmpComponentOutDir);
     timeEndDebug("[build] vite-components");
   }
   if (isFullBuild || changeKind === "page" || changeKind === "endpoint") {

package/dist/vite.cjs

@@ -5,11 +5,12 @@ require('node:fs');
 require('node:fs/promises');
 require('node:path');
 require('defuss/server');
-var vite = require('./vite-DlnPNJYO.cjs');
+var vite = require('./vite-CkpguLfK.cjs');
 require('node:crypto');
 require('@mdx-js/rollup');
 require('vite');
 require('defuss-vite');
+require('node:module');
 require('node:url');
 require('node:os');
 require('esbuild');

package/dist/vite.mjs

@@ -3,11 +3,12 @@ import 'node:fs';
 import 'node:fs/promises';
 import 'node:path';
 import 'defuss/server';
-export { f as defussSsg } from './vite-DLXcqaZX.mjs';
+export { f as defussSsg } from './vite-DdJcWQGP.mjs';
 import 'node:crypto';
 import '@mdx-js/rollup';
 import 'vite';
 import 'defuss-vite';
+import 'node:module';
 import 'node:url';
 import 'node:os';
 import 'esbuild';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "defuss-ssg",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "type": "module",
   "publishConfig": {
     "access": "public"