feat: better platform name detection (#1326)

* feat: better platform name detection

* chore: code

* Update packages/platform-ios/src/commands/runIOS/index.ts

Co-authored-by: Michał Pierzchała <[email protected]>

* fix: ci

* chore: fix lint

Co-authored-by: Michał Pierzchała <[email protected]>

Author: grabbou

packages/platform-ios/src/commands/runIOS/index.ts

@@ -190,7 +190,7 @@ async function runOnSimulator(
     bootSimulator(selectedSimulator);
   }
 
-  const appName = await buildProject(
+  const buildOutput = await buildProject(
     xcodeProject,
     selectedSimulator.udid,
     scheme,
@@ -200,8 +200,7 @@ async function runOnSimulator(
   const appPath = getBuildPath(
     xcodeProject,
     args.configuration,
-    appName,
-    false,
+    buildOutput,
     scheme,
   );
 
@@ -257,7 +256,7 @@ async function runOnDevice(
     );
   }
 
-  const appName = await buildProject(
+  const buildOutput = await buildProject(
     xcodeProject,
     selectedDevice.udid,
     scheme,
@@ -266,7 +265,7 @@ async function runOnDevice(
 
   const iosDeployInstallArgs = [
     '--bundle',
-    getBuildPath(xcodeProject, args.configuration, appName, true, scheme),
+    getBuildPath(xcodeProject, args.configuration, buildOutput, scheme),
     '--id',
     selectedDevice.udid,
     '--justlaunch',
@@ -367,7 +366,7 @@ function buildProject(
         return;
       }
       logger.success('Successfully built the app');
-      resolve(getProductName(buildOutput) || scheme);
+      resolve(buildOutput);
     });
   });
 }
@@ -408,20 +407,9 @@ function getTargetPaths(buildSettings: string) {
 function getBuildPath(
   xcodeProject: ProjectInfo,
   configuration: string,
-  appName: string,
-  isDevice: boolean,
+  buildOutput: string,
   scheme: string,
 ) {
-  let device;
-
-  if (isDevice) {
-    device = 'iphoneos';
-  } else if (appName.toLowerCase().includes('tvos')) {
-    device = 'appletvsimulator';
-  } else {
-    device = 'iphonesimulator';
-  }
-
   const buildSettings = child_process.execFileSync(
     'xcodebuild',
     [
@@ -430,7 +418,7 @@ function getBuildPath(
       '-scheme',
       scheme,
       '-sdk',
-      device,
+      getPlatformName(buildOutput),
       '-configuration',
       configuration,
       '-showBuildSettings',
@@ -451,11 +439,17 @@ function getBuildPath(
   return `${targetBuildDir}/${executableFolderPath}`;
 }
 
-function getProductName(buildOutput: string) {
-  const productNameMatch = /export FULL_PRODUCT_NAME="?(.+).app"?$/m.exec(
+function getPlatformName(buildOutput: string) {
+  // Xcode can sometimes escape `=` with a backslash or put the value in quotes
+  const platformNameMatch = /export PLATFORM_NAME\\?="?(\w+)"?$/m.exec(
     buildOutput,
   );
-  return productNameMatch ? productNameMatch[1] : null;
+  if (!platformNameMatch) {
+    throw new CLIError(
+      'Couldn\'t find "PLATFORM_NAME" variable in xcodebuild output. Please report this issue and run your project with Xcode instead.',
+    );
+  }
+  return platformNameMatch[1];
 }
 
 function xcprettyAvailable() {