@stacksjs/stx 0.2.152 → 0.2.154

package/dist/site-builder/build.js

@@ -19,6 +19,7 @@ import { generateSitemap } from "./sitemap.js";
 import { generateRobots } from "./robots.js";
 import { injectRouterScript } from "./router.js";
 import { injectThemeBootstrap } from "./theme.js";
+import { buildIsolatingFailures } from "../isolated-build.js";
 import {
   applyTranslations,
   buildAlternateLinks,
@@ -31,18 +32,31 @@ export async function buildStaticSite(options) {
   if (!options.noClean)
     rmSync(outDir, { recursive: !0, force: !0 });
   mkdirSync(outDir, { recursive: !0 });
-  const glob = new Glob(`${pagesDir}/**/*.stx`), entrypoints = await Array.fromAsync(glob.scan("."));
+  const glob = new Glob(`${pagesDir}/**/*.stx`), discovered = await Array.fromAsync(glob.scan(".")), excludeDirs = options.excludeDirs ?? ["layouts", "partials", "components"], excluded = [], entrypoints = discovered.filter((file) => {
+    const rel = file.slice(pagesDir.length).replace(/^[\\/]+/, "");
+    if (rel.split(/[\\/]/).slice(0, -1).some((seg) => excludeDirs.includes(seg))) {
+      excluded.push(file);
+      return !1;
+    }
+    return !rel.split(/[\\/]/).some((seg) => seg.startsWith("_"));
+  });
+  if (excluded.length > 0)
+    console.warn(`[stx] ${excluded.length} file(s) under ${pagesDir}/ skipped as non-pages: ${excludeDirs.join(", ")}`);
   if (entrypoints.length === 0)
     throw Error(`No .stx files found in ${pagesDir}/`);
-  const result = await Bun.build({
-    entrypoints,
+  const isolated = await buildIsolatingFailures(entrypoints, (subset) => Bun.build({
+    entrypoints: subset,
     outdir: outDir,
     plugins: [stxPlugin()],
     naming: { entry: "[name].[ext]" }
-  });
-  if (!result.success) {
-    console.error(result.logs);
-    throw Error("Build failed");
+  }));
+  if (isolated.failed.length > 0) {
+    for (const { entrypoint, error } of isolated.failed)
+      console.error(`[stx] failed to build ${entrypoint}:
+  ${error}`);
+    if (isolated.succeeded.length === 0)
+      throw Error(`Build failed: none of the ${entrypoints.length} page(s) could be built`);
+    console.error(`[stx] ${isolated.failed.length} of ${entrypoints.length} page(s) skipped; the rest were built.`);
   }
   pruneEmptyJsChunks(outDir);
   const htmlFiles = listFiles(outDir).filter((f) => f.endsWith(".html")), i18n = resolveI18n(options, process.cwd()), knownPaths = new Set(htmlFiles.map(pathFromFile));

package/dist/site-builder/seo.js

@@ -18,30 +18,39 @@ export function injectSeo(html, site, page = {}, pagePath = "/") {
     html = html.replace(stxAutoBlockRe, "");
   html = html.replace(/<!--\s*SEO\s*-->[\s\S]*?<!--\s*\/SEO\s*-->\s*/g, "");
   html = html.replace(/<meta\s+name="title"\s+content="stx Project"[^>]*>\s*/g, "").replace(/<meta\s+name="description"\s+content="A website built with stx[^"]*"[^>]*>\s*/g, "").replace(/<meta\s+property="og:title"\s+content="stx Project"[^>]*>\s*/g, "").replace(/<meta\s+property="og:description"\s+content="A website built with stx[^"]*"[^>]*>\s*/g, "").replace(/<meta\s+name="twitter:title"\s+content="stx Project"[^>]*>\s*/g, "").replace(/<meta\s+name="twitter:description"\s+content="A website built with stx[^"]*"[^>]*>\s*/g, "");
-  const headEnd = html.search(/<\/head>/i), head = headEnd === -1 ? html : html.slice(0, headEnd), declared = (tag) => {
+  const headEnd = html.search(/<\/head>/i), head = headEnd === -1 ? html : html.slice(0, headEnd), PLACEHOLDER_TITLES = /^(?:stx App|stx Project|Document|Untitled)$/i, existingTitle = /<title[^>]*>([\s\S]*?)<\/title>/i.exec(head)?.[1]?.trim(), titleIsPlaceholder = existingTitle === void 0 || existingTitle === "" || PLACEHOLDER_TITLES.test(existingTitle), declared = (tag) => {
     if (/^<title[\s>]/i.test(tag))
-      return /<title[\s>]/i.test(head);
+      return /<title[\s>]/i.test(head) && !titleIsPlaceholder;
     if (/rel="canonical"/i.test(tag))
       return /<link[^>]+rel=["']canonical["']/i.test(head);
     const key = /(?:property|name)="([^"]+)"/i.exec(tag)?.[1];
     if (!key)
       return !1;
     return new RegExp(`<meta[^>]+(?:property|name)=["']${key.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}["']`, "i").test(head);
-  }, missing = tags.filter((tag) => !declared(tag));
+  };
+  let missing = tags.filter((tag) => !declared(tag));
   if (missing.length === 0)
     return html;
+  let output = html;
+  const titleTag = missing.find((tag) => /^<title[\s>]/i.test(tag));
+  if (titleTag && titleIsPlaceholder && /<title[^>]*>[\s\S]*?<\/title>/i.test(output)) {
+    output = output.replace(/<title[^>]*>[\s\S]*?<\/title>/i, () => titleTag);
+    missing = missing.filter((tag) => tag !== titleTag);
+    if (missing.length === 0)
+      return output;
+  }
   const block = `<!-- SEO -->
 ${missing.join(`
 `)}
-<!-- /SEO -->`;
-  if (headEnd !== -1)
-    return `${html.slice(0, headEnd)}${block}
-${html.slice(headEnd)}`;
-  if (/<head[^>]*>/i.test(html))
-    return html.replace(/<head([^>]*)>/i, `<head$1>
+<!-- /SEO -->`, outEnd = output.search(/<\/head>/i);
+  if (outEnd !== -1)
+    return `${output.slice(0, outEnd)}${block}
+${output.slice(outEnd)}`;
+  if (/<head[^>]*>/i.test(output))
+    return output.replace(/<head([^>]*)>/i, `<head$1>
 ${block}`);
   return `${block}
-${html}`;
+${output}`;
 }
 function escapeAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");

package/dist/site-builder/theme.js

@@ -1,9 +1,10 @@
+import { COLOR_MODE_BOOT_MARKER } from "../color-mode-boot.js";
 const FAVICON_FN = `window.__stxThemeIcon=function(isDark){try{var want=isDark?'dark':'light';var pick=document.querySelector('link[rel~="icon"][media*="prefers-color-scheme: '+want+'"]');if(!pick)return;var live=document.querySelector('link[rel~="icon"]:not([media])');if(!live){live=document.createElement('link');live.setAttribute('rel','icon');document.head.appendChild(live)}if(pick.type)live.setAttribute('type',pick.type);var href=pick.getAttribute('href');if(live.getAttribute('href')!==href)live.setAttribute('href',href)}catch(e){}};`, FOUC_SCRIPT = (defaultTheme, storageKey, lightColor, darkColor) => `(function(){${FAVICON_FN}function read(){try{var k=${JSON.stringify(storageKey)};var t=localStorage.getItem(k);return t===null?(${JSON.stringify(defaultTheme)}==='dark'||(${JSON.stringify(defaultTheme)}==='auto'&&window.matchMedia('(prefers-color-scheme: dark)').matches)):t==='dark'}catch(e){return ${JSON.stringify(defaultTheme)}==='dark'}}function apply(){var isDark=read();var html=document.documentElement;html.classList[isDark?'add':'remove']('dark');var color=isDark?${JSON.stringify(darkColor)}:${JSON.stringify(lightColor)};if(!document.head)return;var tc=document.querySelector('meta[name="theme-color"]:not([media])');if(!tc){tc=document.createElement('meta');tc.setAttribute('name','theme-color');tc.setAttribute('data-stx-theme-meta','1')}tc.setAttribute('content',color);if(tc!==document.head.firstChild){document.head.insertBefore(tc,document.head.firstChild)}if(window.__stxThemeIcon)window.__stxThemeIcon(isDark)}apply();window.addEventListener('stx:navigate',apply);window.addEventListener('popstate',apply)})();`, TOGGLE_HANDLER = (storageKey, lightColor, darkColor) => `document.addEventListener('click',function(e){var t=e.target&&e.target.closest&&e.target.closest('#theme-toggle');if(!t)return;var html=document.documentElement;var isDark=html.classList.toggle('dark');try{localStorage.setItem(${JSON.stringify(storageKey)},isDark?'dark':'light')}catch(e){}var tc=document.querySelector('meta[name="theme-color"]:not([media])');if(tc)tc.setAttribute('content',isDark?${JSON.stringify(darkColor)}:${JSON.stringify(lightColor)});if(window.__stxThemeIcon)window.__stxThemeIcon(isDark)});`;
 export function injectThemeBootstrap(html, site) {
   if (site.theme === !1)
     return html;
-  const opts = typeof site.theme === "object" && site.theme !== null ? site.theme : {}, defaultTheme = opts.default ?? "dark", storageKey = opts.storageKey ?? "theme", lightColor = opts.colors?.light ?? "#ffffff", darkColor = opts.colors?.dark ?? "#000000";
-  if (defaultTheme === "dark") {
+  const colorModeOwnsTheme = html.includes(COLOR_MODE_BOOT_MARKER), opts = typeof site.theme === "object" && site.theme !== null ? site.theme : {}, defaultTheme = opts.default ?? "dark", storageKey = opts.storageKey ?? "theme", lightColor = opts.colors?.light ?? "#ffffff", darkColor = opts.colors?.dark ?? "#000000";
+  if (defaultTheme === "dark" && !colorModeOwnsTheme) {
     if (!/<html\b[^>]*\bclass=/.test(html))
       html = html.replace(/<html\b([^>]*)>/i, '<html$1 class="dark">');
     else if (!/<html\b[^>]*\bclass="[^"]*\bdark\b/.test(html))
@@ -19,12 +20,12 @@ export function injectThemeBootstrap(html, site) {
     html = html.replace(/<head\b([^>]*)>/i, `<head$1>
   ${metas}`);
   }
-  if (!html.includes("__stxThemeGuard") && /<head\b[^>]*>/i.test(html)) {
+  if (!colorModeOwnsTheme && !html.includes("__stxThemeGuard") && /<head\b[^>]*>/i.test(html)) {
     const guard = `<script data-stx-theme-guard="1">${FOUC_SCRIPT(defaultTheme, storageKey, lightColor, darkColor)};window.__stxThemeGuard=1;</script>`;
     html = html.replace(/<head\b([^>]*)>/i, `<head$1>
   ${guard}`);
   }
-  if (!html.includes("__stxThemeToggle") && /<\/body>/i.test(html)) {
+  if (!colorModeOwnsTheme && !html.includes("__stxThemeToggle") && /<\/body>/i.test(html)) {
     const handler = `<script data-stx-theme-toggle="1">${TOGGLE_HANDLER(storageKey, lightColor, darkColor)};window.__stxThemeToggle=1;</script>`;
     html = html.replace(/<\/body>/i, `${handler}
 </body>`);

package/dist/site-builder/types.d.ts

@@ -23,6 +23,7 @@ export declare interface SiteConfig {
   social?: SiteSocial
   seo?: SiteSeo
   pagesDir?: string
+  excludeDirs?: string[]
   publicDir?: string
   outDir?: string
   sitemap?: boolean