electrobun 0.0.19-beta.15 → 0.0.19-beta.17

package/package.json

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

package/src/cli/index.ts

@@ -114,13 +114,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}`);
     }
@@ -249,7 +249,6 @@ const commandDefaults = {
 
 // todo (yoav): add types for config
 const defaultConfig = {
-  entrypoint: "src/bun/index.ts",
   app: {
     name: "MyApp",
     identifier: "com.example.myapp",
@@ -268,6 +267,10 @@ const defaultConfig = {
       },
       icons: "icon.iconset",
     },
+    bun: {
+      entrypoint: "src/bun/index.ts",
+      external: [],
+    },
   },
   scripts: {
     postBuild: "",
@@ -474,10 +477,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;
@@ -1318,6 +1337,10 @@ function getConfig() {
           ...(loadedConfig?.build?.mac?.entitlements || {}),
         },
       },
+      bun: {
+        ...defaultConfig.build.bun,
+        ...(loadedConfig?.build?.bun || {}),
+      }
     },
     scripts: {
       ...defaultConfig.scripts,