dbdiff-app 0.1.0 → 0.1.1

package/bin/cli.js

@@ -2,6 +2,7 @@
 
 import { execSync } from "child_process";
 import fs from "fs";
+import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
 
@@ -26,58 +27,31 @@ const pkg = JSON.parse(
 
 console.log(`\nInstalling dbdiff v${pkg.version} from source...\n`);
 
-// Step 1: Install all dependencies (including devDependencies needed for building)
-console.log("Installing dependencies...");
-execSync("npm install --include=dev", { cwd: packageDir, stdio: "inherit" });
+// When run via npx, the package lives inside node_modules/ which causes npm to
+// hoist dependencies to the parent. electron-builder then can't find production
+// deps to bundle into the app. Fix: copy to a standalone temp directory first.
+const insideNodeModules = packageDir
+  .split(path.sep)
+  .includes("node_modules");
 
-// Step 2: Build the Electron app
-console.log("\nBuilding...");
-execSync("npm run build:electron", { cwd: packageDir, stdio: "inherit" });
+let buildDir = packageDir;
 
-// Step 3: Find the built .app bundle
-const releaseDir = path.join(packageDir, "release");
-const entries = fs.readdirSync(releaseDir).filter((e) => e.startsWith("mac"));
-let appPath = null;
-
-for (const entry of entries) {
-  const candidate = path.join(releaseDir, entry, "dbdiff.app");
-  if (fs.existsSync(candidate)) {
-    appPath = candidate;
-    break;
-  }
+if (insideNodeModules) {
+  buildDir = fs.mkdtempSync(path.join(os.tmpdir(), "dbdiff-build-"));
+  console.log("Copying source to temporary build directory...");
+  execSync(`cp -R "${packageDir}/." "${buildDir}"`, { stdio: "inherit" });
 }
 
-if (!appPath) {
-  console.error("Build failed — could not find dbdiff.app in release/");
-  process.exit(1);
-}
-
-// Step 4: Install to /Applications
-const dest = "/Applications/dbdiff.app";
-
-let wasRunning = false;
 try {
-  execSync("pkill -f '/Applications/dbdiff.app'", { stdio: "pipe" });
-  wasRunning = true;
-  console.log("\nQuit running dbdiff instance.");
-} catch {
-  // Not running — that's fine
-}
-
-if (fs.existsSync(dest)) {
-  console.log("Removing existing /Applications/dbdiff.app...");
-  execSync(`rm -rf "${dest}"`);
-}
-
-console.log(
-  `Copying ${path.basename(path.dirname(appPath))}/dbdiff.app → /Applications/`,
-);
-execSync(`cp -R "${appPath}" "${dest}"`);
-
-console.log("\nInstalled dbdiff to /Applications/dbdiff.app");
-console.log("Launch it from Spotlight or your Applications folder.\n");
-
-if (wasRunning) {
-  console.log("Reopening dbdiff...");
-  execSync("open /Applications/dbdiff.app");
+  // Step 1: Install all dependencies (including devDependencies needed for building)
+  console.log("Installing dependencies...");
+  execSync("npm install --include=dev", { cwd: buildDir, stdio: "inherit" });
+
+  // Step 2: Build and install the Electron app
+  console.log("\nBuilding...");
+  execSync("npm run install-from-source", { cwd: buildDir, stdio: "inherit" });
+} finally {
+  if (insideNodeModules) {
+    fs.rmSync(buildDir, { recursive: true, force: true });
+  }
 }

package/electron/main.js

@@ -161,7 +161,10 @@ app.whenReady().then(() => {
   if (isMac) {
     app.dock.setIcon(path.join(__dirname, "icon.png"));
   }
-  createWindow();
+  createWindow().catch((err) => {
+    console.error("Failed to create window:", err);
+    app.quit();
+  });
 });
 
 app.on("window-all-closed", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dbdiff-app",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A database client for PostgreSQL",
   "author": "Louis Arge",
   "type": "module",
@@ -32,7 +32,7 @@
     "typecheck": "tsc -p tsconfig.app.json --noEmit",
     "lint": "eslint .",
     "format": "prettier --write \"src/**/*.{ts,tsx}\" \"server/**/*.ts\"",
-    "install-local-production": "npm run build:electron && node bin/install-local.js"
+    "install-from-source": "npm run build:electron && node bin/install-local.js"
   },
   "dependencies": {
     "@codemirror/lang-sql": "^6.10.0",