@stacksjs/stx 0.2.126 → 0.2.128

package/dist/native-build.d.ts

@@ -67,6 +67,7 @@ export declare interface NativeBuildConfig {
   minimumSystemVersion?: string
   category?: string
   copyright?: string
+  bundleStyle?: 'executable' | 'launcher'
   hotReload?: boolean
   devTools?: boolean
   craftPath?: string

package/dist/native-build.js

@@ -91,29 +91,57 @@ 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")"` : "", craftBinaryDest = join(macOSDir, "craft");
-  copyFileSync(craftPath, craftBinaryDest);
-  chmodSync(craftBinaryDest, 493);
-  const menubarOnly = config.menubarOnly ?? config.systemTray, launcherScript = `#!/bin/bash
+  const sidebarFlags = config.sidebar?.enabled ? `--native-sidebar --sidebar-width ${config.sidebar?.width || 240} --sidebar-config "$(cat "$RESOURCES/sidebar-config.json")"` : "", menubarOnly = config.menubarOnly ?? config.systemTray;
+  if ((config.bundleStyle || (await supportsBundleManifest(craftPath) ? "executable" : "launcher")) === "executable") {
+    const executablePath = join(macOSDir, appName);
+    copyFileSync(craftPath, executablePath);
+    chmodSync(executablePath, 493);
+    const manifest = {
+      html: "index.html",
+      title: config.window?.title || appName,
+      width: config.window?.width || 1200,
+      height: config.window?.height || 800,
+      devTools: Boolean(config.devTools)
+    };
+    if (menubarOnly)
+      manifest.menubarOnly = !0;
+    else if (config.systemTray)
+      manifest.systemTray = !0;
+    if (config.window?.frameless)
+      manifest.frameless = !0;
+    if (config.window?.transparent)
+      manifest.transparent = !0;
+    if (config.window?.alwaysOnTop)
+      manifest.alwaysOnTop = !0;
+    if (config.window?.resizable === !1)
+      manifest.resizable = !1;
+    await Bun.write(join(resourcesDir, "craft.json"), `${JSON.stringify(manifest, null, 2)}
+`);
+  } else {
+    const craftBinaryDest = join(macOSDir, "craft");
+    copyFileSync(craftPath, craftBinaryDest);
+    chmodSync(craftBinaryDest, 493);
+    const sidebarFlags = config.sidebar?.enabled ? `--native-sidebar --sidebar-width ${config.sidebar?.width || 240} --sidebar-config "$(cat "$RESOURCES/sidebar-config.json")"` : "", launcherScript = `#!/bin/bash
 set -euo pipefail
 DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
 RESOURCES="$DIR/../Resources"
 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  ")}
+      `--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);
+    await Bun.write(launcherPath, launcherScript);
+    chmodSync(launcherPath, 493);
+  }
   const hasIcon = Boolean(config.icon && await Bun.file(config.icon).exists());
   if (hasIcon)
     copyFileSync(config.icon, join(resourcesDir, "AppIcon.icns"));
@@ -144,6 +172,25 @@ exec "$DIR/craft" --html-file "$RESOURCES/index.html" \\
   }
   return { success: !0, target: "macos", format: "app", outputPath: appBundlePath };
 }
+async function supportsBundleManifest(craftPath) {
+  try {
+    const proc = Bun.spawn([craftPath, "--version"], { stdout: "pipe", stderr: "pipe" }), [stdout, stderr] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text()
+    ]);
+    await proc.exited;
+    const version = `${stdout}
+${stderr}`.match(/(\d+)\.(\d+)\.(\d+)/);
+    if (!version)
+      return !1;
+    const [major, minor, patch] = version.slice(1).map(Number);
+    if (major > 0 || minor > 0)
+      return !0;
+    return patch >= 57;
+  } catch {
+    return !1;
+  }
+}
 function escapeXml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/stx",
   "type": "module",
-  "version": "0.2.126",
+  "version": "0.2.128",
   "description": "A performant UI Framework. Powered by Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -117,12 +117,12 @@
   "dependencies": {
     "@cwcss/crosswind": "^0.2.12",
     "@stacksjs/clapp": "^0.2.0",
-    "@stacksjs/desktop": "0.2.126",
-    "@stacksjs/sanitizer": "0.2.126",
+    "@stacksjs/desktop": "0.2.128",
+    "@stacksjs/sanitizer": "0.2.128",
     "@stacksjs/ts-i18n": "^0.1.11",
-    "bun-plugin-stx": "0.2.126",
+    "bun-plugin-stx": "0.2.128",
     "bunfig": "^0.15.15",
-    "stx-router": "0.2.126",
+    "stx-router": "0.2.128",
     "ts-broadcasting": "^0.0.9",
     "ts-images": "^0.1.9",
     "ts-syntax-highlighter": "^0.2.1"