Find uxp app

Author: hansottowirtz

packages/uxp-devtools-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe-fixed-uxp/uxp-devtools-cli",
-  "version": "1.5.2",
+  "version": "1.5.8",
   "description": "Command line interface for rapid UXP plugin development",
   "main": "src/uxp.js",
   "scripts": {
@@ -33,6 +33,7 @@
     "@adobe/uxp-template-ps-react-typescript": "^1.0.0",
     "@adobe/uxp-template-ps-starter": "^1.0.0",
     "@adobe/uxp-template-xd-starter": "^1.0.0",
+    "app-path": "^3.3.0",
     "chalk": "^3.0.0",
     "cli-table3": "^0.6.0",
     "prompts": "^2.3.2",

packages/uxp-devtools-cli/scripts/setupInspectApp.js

@@ -13,7 +13,7 @@ const path = require("path");
 const { execSync } = require("child_process");
 
 function generateDevtoolsAppPacakge() {
-    let uxpDevtoolAppDir =  require.resolve("@adobe/uxp-inspect-frontend/package.json");
+    let uxpDevtoolAppDir =  require.resolve("@adobe-fixed-uxp/uxp-inspect-frontend/package.json");
     uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir);
 
     execSync("yarn package", {

packages/uxp-devtools-cli/src/cli/utils/CLICDTInspectMgr.js

@@ -13,24 +13,31 @@ governing permissions and limitations under the License.
 const path = require("path");
 const child_process = require("child_process");
 const process = require("process");
+const appPath = require("app-path");
 const { createDeferredPromise } = require("./common");
 
 function getDevtoolsAppExecutablePath() {
-    let uxpDevtoolAppDir =  require.resolve("@adobe/uxp-inspect-frontend/package.json");
-    uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir);
-
     const productName = "Adobe UXP Developer Tool";
-    const baseFolder = path.resolve(uxpDevtoolAppDir, "dist");
+    try {
+        let uxpDevtoolAppDir =  require.resolve("@adobe-fixed-uxp/uxp-inspect-frontend/package.json");
+        uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir);
 
-    let executablePath = "";
-    if (process.platform === "darwin") {
-        executablePath = `${baseFolder}/mac/${productName}.app/Contents/MacOS/${productName}`;
-    }
-    else if (process.platform === "win32") {
-        executablePath = `${baseFolder}/win-unpacked/${productName}.exe`;
-    }
+        const baseFolder = path.resolve(uxpDevtoolAppDir, "dist");
 
-    return executablePath;
+        let executablePath = "";
+        if (process.platform === "darwin") {
+            executablePath = `${baseFolder}/mac/${productName}.app/Contents/MacOS/${productName}`;
+        }
+        else if (process.platform === "win32") {
+            executablePath = `${baseFolder}/win-unpacked/${productName}.exe`;
+        }
+
+        return executablePath;
+    } catch (e) {
+        const p = appPath.sync(productName);
+        if (!p) throw new Error(`${productName} not found`);
+        return `${p}/Contents/MacOS/${productName}`;
+    }
 }
 
 function wrapArg(name, arg) {

yarn.lock

@@ -2894,6 +2894,13 @@ app-builder-lib@23.6.0:
     tar "^6.1.11"
     temp-file "^3.4.0"
 
+app-path@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/app-path/-/app-path-3.3.0.tgz#0342a909db37079c593979c720f99e872475eba3"
+  integrity sha512-EAgEXkdcxH1cgEePOSsmUtw9ItPl0KTxnh/pj9ZbhvbKbij9x0oX6PWpGnorDr0DS5AosLgoa5n3T/hZmKQpYA==
+  dependencies:
+    execa "^1.0.0"
+
 append-transform@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12"