electrobun 0.0.19-beta.16 → 0.0.19-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electrobun",
-  "version": "0.0.19-beta.16",
+  "version": "0.0.19-beta.18",
   "description": "Build ultra fast, tiny, and cross-platform desktop apps with Typescript.",
   "license": "MIT",
   "author": "Blackboard Technologies Inc.",

package/src/cli/index.ts

@@ -92,12 +92,26 @@ const PATHS = {
 };
 
 async function ensureCoreDependencies() {
-  // Check if core dependencies already exist
-  if (existsSync(PATHS.BUN_BINARY) && existsSync(PATHS.LAUNCHER_RELEASE)) {
+  // Check if all core dependencies exist
+  const requiredFiles = [
+    PATHS.BUN_BINARY,
+    PATHS.LAUNCHER_RELEASE,
+    PATHS.MAIN_JS,
+    // Platform-specific native wrapper
+    OS === 'macos' ? PATHS.NATIVE_WRAPPER_MACOS :
+    OS === 'win' ? PATHS.NATIVE_WRAPPER_WIN :
+    PATHS.NATIVE_WRAPPER_LINUX
+  ];
+  
+  const allFilesExist = requiredFiles.every(file => existsSync(file));
+  if (allFilesExist) {
     return;
   }
 
-  console.log('Core dependencies not found, downloading...');
+  // Show which files are missing
+  const missingFiles = requiredFiles.filter(file => !existsSync(file));
+  console.log('Core dependencies not found. Missing files:', missingFiles.map(f => f.replace(ELECTROBUN_DEP_PATH, '.')).join(', '));
+  console.log('Downloading core binaries...');
   
   // Get the current Electrobun version from package.json
   const packageJsonPath = join(ELECTROBUN_DEP_PATH, 'package.json');
@@ -114,13 +128,13 @@ async function ensureCoreDependencies() {
 
   const platformName = OS === 'macos' ? 'darwin' : OS === 'win' ? 'win32' : 'linux';
   const archName = ARCH;
-  const mainTarballUrl = `https://github.com/blackboardsh/electrobun/releases/download/${version}/electrobun-${platformName}-${archName}.tar.gz`;
+  const coreTarballUrl = `https://github.com/blackboardsh/electrobun/releases/download/${version}/electrobun-core-${platformName}-${archName}.tar.gz`;
   
-  console.log(`Downloading core binaries from: ${mainTarballUrl}`);
+  console.log(`Downloading core binaries from: ${coreTarballUrl}`);
   
   try {
-    // Download main tarball
-    const response = await fetch(mainTarballUrl);
+    // Download core binaries tarball
+    const response = await fetch(coreTarballUrl);
     if (!response.ok) {
       throw new Error(`Failed to download binaries: ${response.status} ${response.statusText}`);
     }
@@ -477,10 +491,26 @@ if (commandArg === "init") {
   //     mkdirSync(destLauncherFolder, {recursive: true});
   // }
   // cpSync(zigLauncherBinarySource, zigLauncherDestination, {recursive: true, dereference: true});
+  // For dev builds, use the actual CLI binary that's currently running
+  // It could be in .cache (npm install) or bin (local dev)
+  let devLauncherPath = PATHS.LAUNCHER_DEV;
+  if (buildEnvironment === "dev" && !existsSync(devLauncherPath)) {
+    // Check .cache location (npm installed)
+    const cachePath = join(ELECTROBUN_DEP_PATH, ".cache", "electrobun") + binExt;
+    if (existsSync(cachePath)) {
+      devLauncherPath = cachePath;
+    } else {
+      // Check bin location (local dev)
+      const binPath = join(ELECTROBUN_DEP_PATH, "bin", "electrobun") + binExt;
+      if (existsSync(binPath)) {
+        devLauncherPath = binPath;
+      }
+    }
+  }
+  
   const bunCliLauncherBinarySource =
     buildEnvironment === "dev"
-      ? // Note: in dev use the cli as the launcher
-        PATHS.LAUNCHER_DEV
+      ? devLauncherPath
       : // Note: for release use the zig launcher optimized for smol size
         PATHS.LAUNCHER_RELEASE;
   const bunCliLauncherDestination = join(appBundleMacOSPath, "launcher") + binExt;