electrobun 0.7.1 → 0.7.2-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.7.1",
+  "version": "0.7.2-beta.0",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",
@@ -34,7 +34,7 @@
     "dev": "bun install && bun build:dev && bun build:cli && cd ../kitchen && bun install && bun build:dev && bun start",
     "dev:clean": "cd ../kitchen && rm -rf node_modules && rm -rf vendors/cef && cd ../package && bun dev",
     "dev:rerun": "cd ../kitchen && bun start",
-    "dev:canary": "bun install && bun build:release && cd ../kitchen && bun install && bun build:canary && bun start:canary",
+    "dev:canary": "bun install && bun build:release && bun build:cli && cd ../kitchen && bun install && bun build:canary",
     "run:template": "bun install && bun build:dev && bun build:cli && cd ../templates/interactive-playground && bun install && bun build:dev && bun start",
     "dev:docs": "cd ../documentation && bun start",
     "build:docs:release": "cd ../documentation && bun run build",

package/src/cli/index.ts

@@ -1120,22 +1120,19 @@ if (commandArg === "init") {
   //     mkdirSync(destLauncherFolder, {recursive: true});
   // }
   // cpSync(zigLauncherBinarySource, zigLauncherDestination, {recursive: true, dereference: true});
-  // Copy zig launcher for all builds (dev, canary, stable) - macOS only
-  if (targetOS === 'macos') {
-    const bunCliLauncherBinarySource = targetPaths.LAUNCHER_RELEASE;
-    const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + targetBinExt;
-    const destLauncherFolder = dirname(bunCliLauncherDestination);
-    if (!existsSync(destLauncherFolder)) {
-      // console.info('creating folder: ', destFolder);
-      mkdirSync(destLauncherFolder, { recursive: true });
-    }
-
-    cpSync(bunCliLauncherBinarySource, bunCliLauncherDestination, {
-      recursive: true,
-      dereference: true,
-    });
+  // Copy zig launcher for all platforms
+  const bunCliLauncherBinarySource = targetPaths.LAUNCHER_RELEASE;
+  const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + targetBinExt;
+  const destLauncherFolder = dirname(bunCliLauncherDestination);
+  if (!existsSync(destLauncherFolder)) {
+    mkdirSync(destLauncherFolder, { recursive: true });
   }
 
+  cpSync(bunCliLauncherBinarySource, bunCliLauncherDestination, {
+    recursive: true,
+    dereference: true,
+  });
+
   cpSync(targetPaths.MAIN_JS, join(appBundleFolderResourcesPath, 'main.js'), { dereference: true });
 
   // Bun runtime binary
@@ -1913,13 +1910,32 @@ if (commandArg === "init") {
         buildEnvironment === "stable"
           ? `${baseVolumeName}-stable`
           : baseVolumeName;
-      // hdiutil create -volname "YourAppName" -srcfolder /path/to/YourApp.app -ov -format UDZO YourAppName.dmg
+
+      // Create a staging directory for DMG contents (app + Applications shortcut)
+      const dmgStagingDir = join(buildFolder, '.dmg-staging');
+      if (existsSync(dmgStagingDir)) {
+        rmSync(dmgStagingDir, { recursive: true });
+      }
+      mkdirSync(dmgStagingDir, { recursive: true });
+
+      // Copy the app bundle to the staging directory
+      const stagedAppPath = join(dmgStagingDir, basename(selfExtractingBundle.appBundleFolderPath));
+      execSync(`cp -R ${escapePathForTerminal(selfExtractingBundle.appBundleFolderPath)} ${escapePathForTerminal(stagedAppPath)}`);
+
+      // Create a symlink to /Applications for easy drag-and-drop installation
+      const applicationsLink = join(dmgStagingDir, 'Applications');
+      symlinkSync('/Applications', applicationsLink);
+
+      // hdiutil create -volname "YourAppName" -srcfolder /path/to/staging -ov -format UDZO YourAppName.dmg
       // Note: use ULFO (lzfse) for better compatibility with large CEF frameworks and modern macOS
       execSync(
         `hdiutil create -volname "${dmgVolumeName}" -srcfolder ${escapePathForTerminal(
-          selfExtractingBundle.appBundleFolderPath
+          dmgStagingDir
         )} -ov -format ULFO ${escapePathForTerminal(dmgCreationPath)}`
       );
+
+      // Clean up staging directory
+      rmSync(dmgStagingDir, { recursive: true });
       if (buildEnvironment === "stable" && dmgCreationPath !== finalDmgPath) {
         renameSync(dmgCreationPath, finalDmgPath);
       }
@@ -1977,29 +1993,8 @@ Categories=Application;
         // Make desktop file executable
         execSync(`chmod +x ${escapePathForTerminal(desktopFilePath)}`);
         
-        // Create user-friendly launcher script
-        const launcherScriptContent = `#!/bin/bash
-# ${config.package?.name || config.app.name} Launcher
-# This script launches the application from any location
-
-# Get the directory where this script is located
-SCRIPT_DIR="$(cd "$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
-
-# Find the launcher binary relative to this script
-LAUNCHER_BINARY="\$SCRIPT_DIR/bin/launcher"
-
-if [ ! -x "\$LAUNCHER_BINARY" ]; then
-    echo "Error: Could not find launcher binary at \$LAUNCHER_BINARY"
-    exit 1
-fi
-
-# Launch the application
-exec "\$LAUNCHER_BINARY" "\$@"
-`;
-        
-        const launcherScriptPath = join(appBundleFolderPath, `${appFileName}.sh`);
-        writeFileSync(launcherScriptPath, launcherScriptContent);
-        execSync(`chmod +x ${escapePathForTerminal(launcherScriptPath)}`);
+        // Note: No longer creating shell script wrapper - users can run bin/launcher directly 
+        // or use the symlink created by the self-extractor
         
         // Create self-extracting Linux binary (similar to Windows approach)
         const selfExtractingLinuxPath = await createLinuxSelfExtractingBinary(
@@ -2017,10 +2012,10 @@ exec "\$LAUNCHER_BINARY" "\$@"
         // Also keep the raw .run for backwards compatibility (optional)
         // artifactsToUpload.push(selfExtractingLinuxPath);
         
-        // On Linux, create a tar.gz of the bundle
+        // On Linux, create a tar.gz of the bundle (for build process, not uploaded to artifacts)
         const linuxTarPath = join(buildFolder, `${appFileName}.tar.gz`);
         execSync(`tar -czf ${escapePathForTerminal(linuxTarPath)} -C ${escapePathForTerminal(buildFolder)} ${escapePathForTerminal(basename(appBundleFolderPath))}`);
-        artifactsToUpload.push(linuxTarPath);
+        // Note: Not adding to artifactsToUpload - we use .tar.zst for updates and .run.tar.gz for distribution
       }
     }
 
@@ -2199,40 +2194,48 @@ exec "\$LAUNCHER_BINARY" "\$@"
     throw new Error(`Unsupported OS: ${OS}`);
   }
 
-  if (OS === 'macos') {
-    // Use the zig launcher for all builds (dev, canary, stable)
-    mainProc = Bun.spawn([join(bundleExecPath, 'launcher')], {
-      stdio: ['inherit', 'inherit', 'inherit'],
-      cwd: bundleExecPath
-    })
-  } else if (OS === 'win') {  
-    // Try the main process - use relative path to Resources folder
-    mainProc =  Bun.spawn(['./bun.exe', '../Resources/main.js'], {
-      stdio: ['inherit', 'inherit', 'inherit'],
-      cwd: bundleExecPath,
-      onExit: (proc, exitCode, signalCode, error) => {
-        console.log('Bun process exited:', { exitCode, signalCode, error });
-      }
-    })
-  } else if (OS === 'linux') {
-    let env = { ...process.env };
-    
-    // Add LD_PRELOAD for CEF libraries to fix static TLS allocation issues
-    if (config.build.linux?.bundleCEF) {
-      const cefLibs = ['./libcef.so', './libvk_swiftshader.so'];
-      const existingCefLibs = cefLibs.filter(lib => existsSync(join(bundleExecPath, lib)));
+  if (OS === 'macos' || OS === 'linux') {
+    // For Linux dev mode, update libNativeWrapper.so based on bundleCEF setting
+    if (OS === 'linux') {
+      const currentLibPath = join(bundleExecPath, 'libNativeWrapper.so');
+      const targetPaths = getPlatformPaths('linux', ARCH);
+      const correctLibSource = config.build.linux?.bundleCEF 
+        ? targetPaths.NATIVE_WRAPPER_LINUX_CEF 
+        : targetPaths.NATIVE_WRAPPER_LINUX;
       
-      if (existingCefLibs.length > 0) {
-        env['LD_PRELOAD'] = existingCefLibs.join(':');
-        console.log(`Using LD_PRELOAD for CEF: ${env['LD_PRELOAD']}`);
+      if (existsSync(correctLibSource)) {
+        try {
+          cpSync(correctLibSource, currentLibPath, { dereference: true });
+          console.log(`Updated libNativeWrapper.so for ${config.build.linux?.bundleCEF ? 'CEF' : 'GTK-only'} mode`);
+        } catch (error) {
+          console.warn('Failed to update libNativeWrapper.so:', error);
+        }
       }
     }
     
-    mainProc = Bun.spawn([join(bundleExecPath, 'bun'), join(bundleResourcesPath, 'main.js')], {
+    // Use the zig launcher for macOS and Linux
+    mainProc = Bun.spawn([join(bundleExecPath, 'launcher')], {
       stdio: ['inherit', 'inherit', 'inherit'],
-      cwd: bundleExecPath,
-      env
+      cwd: bundleExecPath
     })
+  } else if (OS === 'win') {  
+    // Windows: Use launcher if available, otherwise fallback to direct execution
+    const launcherPath = join(bundleExecPath, 'launcher.exe');
+    if (existsSync(launcherPath)) {
+      mainProc = Bun.spawn([launcherPath], {
+        stdio: ['inherit', 'inherit', 'inherit'],
+        cwd: bundleExecPath
+      })
+    } else {
+      // Fallback for older builds
+      mainProc = Bun.spawn(['./bun.exe', '../Resources/main.js'], {
+        stdio: ['inherit', 'inherit', 'inherit'],
+        cwd: bundleExecPath,
+        onExit: (proc, exitCode, signalCode, error) => {
+          console.log('Bun process exited:', { exitCode, signalCode, error });
+        }
+      })
+    }
   }
 
   process.on("SIGINT", () => {