@stacksjs/stx 0.2.119 → 0.2.121

package/dist/native-build.js

@@ -4,6 +4,7 @@ import { spawn, execSync } from "node:child_process";
 import { tmpdir, homedir, platform as osPlatform } from "node:os";
 import { injectCraftBridge } from "./craft-bridge.js";
 import { processCraftComponents, CRAFT_COMPONENT_STYLES } from "./craft-components.js";
+import { renderTemplate } from "./render.js";
 export async function buildNative(config) {
   const startTime = Date.now();
   try {
@@ -17,7 +18,10 @@ export async function buildNative(config) {
     const target = config.target || detectPlatform(), format = config.format || getDefaultFormat(target), outputDir = config.output || join(process.cwd(), "dist", "native");
     if (!existsSync(outputDir))
       mkdirSync(outputDir, { recursive: !0 });
-    let html = await Bun.file(config.input).text();
+    let html = await renderTemplate(config.input, {
+      context: config.context,
+      options: { isDev: !1 }
+    });
     html = injectCraftBridge(html, { debug: config.verbose });
     html = processCraftComponents(html);
     if (!html.includes("craft-component-styles")) {
@@ -87,64 +91,51 @@ async function buildMacOS(html, appName, appVersion, outputDir, format, config,
     sidebarConfigPath = join(resourcesDir, "sidebar-config.json");
     await Bun.write(sidebarConfigPath, JSON.stringify(config.sidebar.config));
   }
-  const sidebarFlags = config.sidebar?.enabled ? `--native-sidebar --sidebar-width ${config.sidebar?.width || 240} --sidebar-config "$(cat "$RESOURCES/sidebar-config.json")"` : "", launcherScript = `#!/bin/bash
+  const sidebarFlags = config.sidebar?.enabled ? `--native-sidebar --sidebar-width ${config.sidebar?.width || 240} --sidebar-config "$(cat "$RESOURCES/sidebar-config.json")"` : "", craftBinaryDest = join(macOSDir, "craft");
+  copyFileSync(craftPath, craftBinaryDest);
+  chmodSync(craftBinaryDest, 493);
+  const menubarOnly = config.menubarOnly ?? config.systemTray, launcherScript = `#!/bin/bash
+set -euo pipefail
 DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 RESOURCES="$DIR/../Resources"
-"${craftPath}" --html "$(cat "$RESOURCES/index.html")" \\
-  --title "${config.window?.title || appName}" \\
-  --width ${config.window?.width || 1200} \\
-  --height ${config.window?.height || 800} \\
-  ${config.systemTray ? "--system-tray" : ""} \\
-  ${config.devTools ? "--dev-tools" : ""} \\
-  ${config.window?.frameless ? "--frameless" : ""} \\
-  ${config.window?.alwaysOnTop ? "--always-on-top" : ""} \\
-  ${sidebarFlags}
+exec "$DIR/craft" --html-file "$RESOURCES/index.html" \\
+  ${[
+    `--title "${config.window?.title || appName}"`,
+    `--width ${config.window?.width || 1200}`,
+    `--height ${config.window?.height || 800}`,
+    menubarOnly ? "--menubar-only" : config.systemTray ? "--system-tray" : "",
+    config.devTools ? "" : "--no-devtools",
+    config.window?.frameless ? "--frameless" : "",
+    config.window?.transparent ? "--transparent" : "",
+    config.window?.alwaysOnTop ? "--always-on-top" : "",
+    config.window?.resizable === !1 ? "--no-resize" : "",
+    sidebarFlags
+  ].filter(Boolean).join(" \\\n  ")}
 `, launcherPath = join(macOSDir, appName);
   await Bun.write(launcherPath, launcherScript);
   chmodSync(launcherPath, 493);
-  const craftBinaryDest = join(macOSDir, "craft");
-  try {
-    copyFileSync(craftPath, craftBinaryDest);
-    chmodSync(craftBinaryDest, 493);
-  } catch {
-    const craftWrapperScript = `#!/bin/bash
-exec "${craftPath}" "$@"`;
-    await Bun.write(craftBinaryDest, craftWrapperScript);
-    chmodSync(craftBinaryDest, 493);
-  }
-  const infoPlist = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>CFBundleExecutable</key>
-    <string>${appName}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${bundleId}</string>
-    <key>CFBundleName</key>
-    <string>${appName}</string>
-    <key>CFBundleDisplayName</key>
-    <string>${appName}</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${appVersion}</string>
-    <key>CFBundleVersion</key>
-    <string>${appVersion}</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.15</string>
-    <key>NSHighResolutionCapable</key>
-    <true/>
-    <key>NSSupportsAutomaticGraphicsSwitching</key>
-    <true/>
-    <key>LSUIElement</key>
-    <${config.systemTray ? "true" : "false"}/>
-</dict>
-</plist>`;
-  await Bun.write(join(contentsDir, "Info.plist"), infoPlist);
-  if (config.icon && await Bun.file(config.icon).exists())
+  const hasIcon = Boolean(config.icon && await Bun.file(config.icon).exists());
+  if (hasIcon)
     copyFileSync(config.icon, join(resourcesDir, "AppIcon.icns"));
+  const plistEntries = {
+    CFBundleExecutable: appName,
+    CFBundleIdentifier: bundleId,
+    CFBundleName: appName,
+    CFBundleDisplayName: appName,
+    CFBundleShortVersionString: appVersion,
+    CFBundleVersion: appVersion,
+    CFBundlePackageType: "APPL",
+    CFBundleSignature: "????",
+    LSMinimumSystemVersion: config.minimumSystemVersion || "13.0",
+    NSHighResolutionCapable: !0,
+    NSSupportsAutomaticGraphicsSwitching: !0,
+    LSUIElement: config.menubarOnly ?? Boolean(config.systemTray),
+    ...hasIcon ? { CFBundleIconFile: "AppIcon" } : {},
+    ...config.category ? { LSApplicationCategoryType: config.category } : {},
+    ...config.copyright ? { NSHumanReadableCopyright: config.copyright } : {},
+    ...config.infoPlist || {}
+  };
+  await Bun.write(join(contentsDir, "Info.plist"), renderInfoPlist(plistEntries));
   if (format === "dmg") {
     const dmgPath = join(outputDir, `${appName}-${appVersion}.dmg`), dmgResult = await createDMG(appBundlePath, dmgPath, appName);
     if (!dmgResult.success)
@@ -153,19 +144,38 @@ exec "${craftPath}" "$@"`;
   }
   return { success: !0, target: "macos", format: "app", outputPath: appBundlePath };
 }
+function escapeXml(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
+function renderInfoPlist(entries) {
+  return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+${Object.entries(entries).map(([key, value]) => {
+    const rendered = typeof value === "boolean" ? `<${value}/>` : typeof value === "number" ? `<integer>${value}</integer>` : `<string>${escapeXml(String(value))}</string>`;
+    return `    <key>${escapeXml(key)}</key>
+    ${rendered}`;
+  }).join(`
+`)}
+</dict>
+</plist>
+`;
+}
 async function buildWindows(html, appName, appVersion, outputDir, format, config, craftPath) {
   const appDir = join(outputDir, appName);
   mkdirSync(appDir, { recursive: !0 });
   const htmlPath = join(appDir, "index.html");
   await Bun.write(htmlPath, html);
+  copyFileSync(craftPath, join(appDir, "craft.exe"));
   const launcherBat = `@echo off
 set DIR=%~dp0
-"${craftPath}" --html-file "%DIR%index.html" ^
+"%DIR%craft.exe" --html-file "%DIR%index.html" ^
   --title "${config.window?.title || appName}" ^
   --width ${config.window?.width || 1200} ^
   --height ${config.window?.height || 800} ^
   ${config.systemTray ? "--system-tray" : ""} ^
-  ${config.devTools ? "--dev-tools" : ""}
+  ${config.devTools ? "" : "--no-devtools"}
 `;
   await Bun.write(join(appDir, `${appName}.bat`), launcherBat);
   if (format === "zip") {
@@ -181,14 +191,18 @@ async function buildLinux(html, appName, appVersion, outputDir, format, config,
   mkdirSync(appDir, { recursive: !0 });
   const htmlPath = join(appDir, "index.html");
   await Bun.write(htmlPath, html);
+  const craftDest = join(appDir, "craft");
+  copyFileSync(craftPath, craftDest);
+  chmodSync(craftDest, 493);
   const launcherScript = `#!/bin/bash
+set -euo pipefail
 DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
-"${craftPath}" --html-file "$DIR/index.html" \\
+exec "$DIR/craft" --html-file "$DIR/index.html" \\
   --title "${config.window?.title || appName}" \\
   --width ${config.window?.width || 1200} \\
   --height ${config.window?.height || 800} \\
   ${config.systemTray ? "--system-tray" : ""} \\
-  ${config.devTools ? "--dev-tools" : ""}
+  ${config.devTools ? "" : "--no-devtools"}
 `, launcherPath = join(appDir, appName.toLowerCase());
   await Bun.write(launcherPath, launcherScript);
   chmodSync(launcherPath, 493);
@@ -231,10 +245,13 @@ async function buildAndroid(_html, appName, _appVersion, _outputDir, _config, _c
   };
 }
 async function findCraftBinary() {
+  if (process.env.CRAFT_BIN && await Bun.file(process.env.CRAFT_BIN).exists())
+    return process.env.CRAFT_BIN;
   const possiblePaths = [
-    join(process.cwd(), "../../craft/packages/zig/zig-out/bin/craft-minimal"),
-    join(process.cwd(), "../craft/packages/zig/zig-out/bin/craft-minimal"),
-    join(homedir(), "Code/craft/packages/zig/zig-out/bin/craft-minimal"),
+    join(process.cwd(), "../../craft/packages/zig/zig-out/bin/craft"),
+    join(process.cwd(), "../craft/packages/zig/zig-out/bin/craft"),
+    join(homedir(), "Code/Tools/craft/packages/zig/zig-out/bin/craft"),
+    join(homedir(), "Code/craft/packages/zig/zig-out/bin/craft"),
     "/usr/local/bin/craft",
     "/usr/bin/craft",
     join(homedir(), ".local/bin/craft"),

package/dist/process.js

@@ -676,9 +676,17 @@ async function processOtherDirectives(template, context, filePath, options, depe
   }
   if (opts.seo?.enabled)
     output = injectSeoTags(output, context, opts);
-  const injectIntoHead = (html, snippet) => {
+  const injectIntoHead = (html, snippet, replaceExistingTitle = !0) => {
     if (!snippet)
       return html;
+    const incomingTitle = snippet.match(/<title\b[^>]*>[\s\S]*?<\/title>/i), existingTitle = html.match(/<title\b[^>]*>[\s\S]*?<\/title>/i);
+    if (incomingTitle && existingTitle) {
+      if (replaceExistingTitle)
+        html = html.replace(existingTitle[0], incomingTitle[0]);
+      snippet = snippet.replace(incomingTitle[0], "").trim();
+      if (!snippet)
+        return html;
+    }
     if (/<\/head>/i.test(html))
       return html.replace(/<\/head>/i, `${snippet}
 </head>`);
@@ -691,14 +699,14 @@ ${snippet}`);
 ${snippet}
 </head>`);
     return html;
-  }, { renderHead, getHead } = await import("./head.js"), contextHead = context.__stx_runtime_head, headConfig = contextHead && (contextHead.title || contextHead.meta?.length || contextHead.link?.length) ? contextHead : getHead();
+  }, { renderHead, getHead } = await import("./head.js"), headConfig = context.__stx_runtime_head ?? getHead();
   if (headConfig.title || headConfig.meta?.length || headConfig.link?.length) {
     const renderedHead = renderHead(headConfig);
     if (renderedHead)
       output = injectIntoHead(output, renderedHead);
   }
   if (headResult.headContent)
-    output = injectIntoHead(output, headResult.headContent);
+    output = injectIntoHead(output, headResult.headContent, !headConfig.title);
   if (opts.csp?.enabled && opts.csp.addMetaTag)
     output = injectCspMetaTag(output, opts.csp, context);
   if (opts.analytics?.enabled)