@ulpi/browse 2.3.1 → 2.3.2

package/dist/browse.cjs

@@ -864,7 +864,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@ulpi/browse",
-      version: "2.3.0",
+      version: "2.3.2",
       homepage: "https://browse.ulpi.io",
       repository: {
         type: "git",
@@ -1089,13 +1089,19 @@ __export(bridge_exports, {
   installAdb: () => installAdb
 });
 function resolveDriverApkPath() {
-  const localBuild = path7.resolve(
-    __dirname2,
-    "../../../browse-android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk"
-  );
-  if (fs7.existsSync(localBuild)) return localBuild;
-  const installed = path7.resolve(__dirname2, "../../bin/browse-android.apk");
-  if (fs7.existsSync(installed)) return installed;
+  const candidates = [
+    // 1. Local dev build
+    path7.resolve(__dirname2, "../../../browse-android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk"),
+    // 2. Installed alongside source (bin/ at project root)
+    path7.resolve(__dirname2, "../../bin/browse-android.apk"),
+    // 3. Bundled build (dist/browse.cjs → ../bin/)
+    path7.resolve(__dirname2, "../bin/browse-android.apk"),
+    // 4. Same directory as binary
+    path7.resolve(__dirname2, "browse-android.apk")
+  ];
+  for (const p of candidates) {
+    if (fs7.existsSync(p)) return p;
+  }
   const lazyPath = path7.join(
     process.env.BROWSE_LOCAL_DIR || path7.join(process.cwd(), ".browse"),
     "bin",
@@ -1103,9 +1109,21 @@ function resolveDriverApkPath() {
   );
   if (fs7.existsSync(lazyPath)) return lazyPath;
   throw new Error(
-    "browse-android APK not found. Build it with:\n  cd browse-android && ./gradlew :app:assembleDebugAndroidTest\nOr run: browse doctor --platform android"
+    "browse-android APK not found. Run: browse enable android\nOr build manually: cd browse-android && ./gradlew :app:assembleDebugAndroidTest"
   );
 }
+function resolveAppApkPath() {
+  const candidates = [
+    path7.resolve(__dirname2, "../../../browse-android/app/build/outputs/apk/debug/app-debug.apk"),
+    path7.resolve(__dirname2, "../../bin/browse-android-app.apk"),
+    path7.resolve(__dirname2, "../bin/browse-android-app.apk"),
+    path7.resolve(__dirname2, "browse-android-app.apk")
+  ];
+  for (const p of candidates) {
+    if (fs7.existsSync(p)) return p;
+  }
+  return null;
+}
 function adbExec(serial, ...args) {
   return (0, import_child_process3.execSync)(["adb", "-s", serial, ...args].join(" "), {
     encoding: "utf-8",
@@ -1242,7 +1260,7 @@ function installDriverApk(serial, apkPath) {
   if (installedBase?.includes(`package:${DRIVER_PACKAGE}`) && installedTest?.includes(DRIVER_TEST_PACKAGE)) {
     return;
   }
-  const appApkPath = apkPath.replace("-androidTest", "");
+  const appApkPath = resolveAppApkPath() || apkPath.replace("-androidTest", "");
   if (fs7.existsSync(appApkPath)) {
     try {
       adbExec(serial, "install", "-t", "-r", `"${appApkPath}"`);
@@ -2486,7 +2504,12 @@ async function startIOS(opts = {}) {
     } catch {
     }
   }
-  const runnerDir = path10.resolve(__dirname_svc, "../../../browse-ios-runner");
+  const runnerCandidates = [
+    path10.resolve(__dirname_svc, "../../../browse-ios-runner"),
+    path10.resolve(__dirname_svc, "../../browse-ios-runner"),
+    path10.resolve(__dirname_svc, "../bin/browse-ios-runner")
+  ];
+  const runnerDir = runnerCandidates.find((d) => fs10.existsSync(path10.join(d, "project.yml"))) || runnerCandidates[0];
   const { execSync: execSync7 } = await import("child_process");
   if (!fs10.existsSync(path10.join(runnerDir, "BrowseRunner.xcodeproj", "project.pbxproj"))) {
     log2("Generating Xcode project...");
@@ -23836,12 +23859,18 @@ __export(bridge_exports3, {
   resolveBridgePath: () => resolveBridgePath
 });
 function resolveBridgePath() {
-  const localBuild = path17.resolve(__dirname_bridge, "../../../browse-ax/.build/release/browse-ax");
-  if (fs22.existsSync(localBuild)) return localBuild;
-  const localDebug = path17.resolve(__dirname_bridge, "../../../browse-ax/.build/debug/browse-ax");
-  if (fs22.existsSync(localDebug)) return localDebug;
-  const installed = path17.resolve(__dirname_bridge, "../../bin/browse-ax");
-  if (fs22.existsSync(installed)) return installed;
+  const candidates = [
+    // 1. Local dev build
+    path17.resolve(__dirname_bridge, "../../../browse-ax/.build/release/browse-ax"),
+    path17.resolve(__dirname_bridge, "../../../browse-ax/.build/debug/browse-ax"),
+    // 2. Installed alongside source (bin/ at project root)
+    path17.resolve(__dirname_bridge, "../../bin/browse-ax"),
+    // 3. Bundled build (dist/browse.cjs → ../bin/)
+    path17.resolve(__dirname_bridge, "../bin/browse-ax")
+  ];
+  for (const p of candidates) {
+    if (fs22.existsSync(p)) return p;
+  }
   const lazyPath = path17.join(
     process.env.BROWSE_LOCAL_DIR || path17.join(process.cwd(), ".browse"),
     "bin",
@@ -23849,7 +23878,7 @@ function resolveBridgePath() {
   );
   if (fs22.existsSync(lazyPath)) return lazyPath;
   throw new Error(
-    "browse-ax binary not found. Build it with: cd browse-ax && swift build -c release\nOr run: browse doctor --platform macos"
+    "browse-ax binary not found. Run: browse enable macos\nOr build manually: cd browse-ax && swift build -c release"
   );
 }
 async function ensureMacOSBridge() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ulpi/browse",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "homepage": "https://browse.ulpi.io",
   "repository": {
     "type": "git",