chore: don't require full build output (#204)

* chore: don't require full build output

* changeset

Author: thymikee

.changeset/forty-clouds-cover.md

@@ -0,0 +1,5 @@
+---
+'@rnef/platform-apple-helpers': patch
+---
+
+chore: don't require full build output

packages/platform-apple-helpers/src/lib/commands/run/getBuildSettings.ts

@@ -1,5 +1,6 @@
 import { color, logger, spawn } from '@rnef/tools';
 import type { XcodeProjectInfo } from '../../types/index.js';
+import type { PlatformSDK } from '../../utils/getPlatformInfo.js';
 
 export type BuildSettings = {
   TARGET_BUILD_DIR: string;
@@ -12,7 +13,7 @@ export async function getBuildSettings(
   xcodeProject: XcodeProjectInfo,
   sourceDir: string,
   configuration: string,
-  buildOutput: string,
+  platformSDK: PlatformSDK,
   scheme: string,
   target?: string
 ): Promise<BuildSettings | null> {
@@ -24,7 +25,7 @@ export async function getBuildSettings(
       '-scheme',
       scheme,
       '-sdk',
-      getPlatformName(buildOutput),
+      platformSDK,
       '-configuration',
       configuration,
       '-showBuildSettings',
@@ -67,16 +68,3 @@ export async function getBuildSettings(
 
   return null;
 }
-
-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
-  );
-  if (!platformNameMatch) {
-    throw new Error(
-      'Couldn\'t find "PLATFORM_NAME" variable in xcodebuild output. Please report this issue and run your project with Xcode instead.'
-    );
-  }
-  return platformNameMatch[1];
-}

packages/platform-apple-helpers/src/lib/commands/run/installApp.ts

@@ -1,6 +1,7 @@
 import path from 'node:path';
 import { logger, RnefError, spawn, type SubprocessError } from '@rnef/tools';
 import type { ApplePlatform, XcodeProjectInfo } from '../../types/index.js';
+import { getSimulatorPlatformSDK } from '../../utils/getPlatformInfo.js';
 import { readKeyFromPlist } from '../../utils/plist.js';
 import { getBuildPath } from './getBuildPath.js';
 import { getBuildSettings } from './getBuildSettings.js';
@@ -35,7 +36,7 @@ export default async function installApp({
       xcodeProject,
       sourceDir,
       configuration,
-      `export PLATFORM_NAME=${getPlatformSDK(platform)}`, // simulate build output
+      getSimulatorPlatformSDK(platform),
       scheme,
       target
     );
@@ -84,15 +85,4 @@ export default async function installApp({
   }
 }
 
-export function getPlatformSDK(platform: ApplePlatform) {
-  switch (platform) {
-    case 'ios':
-      return 'iphonesimulator';
-    case 'macos':
-      return 'macosx';
-    case 'tvos':
-      return 'appletvsimulator';
-    case 'visionos':
-      return 'xrsimulator';
-  }
-}
+

packages/platform-apple-helpers/src/lib/commands/run/runOnDevice.ts

@@ -5,6 +5,7 @@ import type {
   Device,
   XcodeProjectInfo,
 } from '../../types/index.js';
+import { getDevicePlatformSDK } from '../../utils/getPlatformInfo.js';
 import { buildProject } from '../build/buildProject.js';
 import { getBuildPath } from './getBuildPath.js';
 import { getBuildSettings } from './getBuildSettings.js';
@@ -19,9 +20,9 @@ export async function runOnDevice(
   sourceDir: string,
   args: RunFlags
 ) {
-  let buildOutput, appPath;
+  let appPath;
   if (!args.binaryPath) {
-    buildOutput = await buildProject(
+    await buildProject(
       xcodeProject,
       sourceDir,
       platform,
@@ -35,7 +36,7 @@ export async function runOnDevice(
       xcodeProject,
       sourceDir,
       configuration,
-      buildOutput,
+      getDevicePlatformSDK(platform),
       scheme
     );
 

packages/platform-apple-helpers/src/lib/commands/run/runOnMac.ts

@@ -1,5 +1,6 @@
 import { color, logger, RnefError, spawn } from '@rnef/tools';
 import type { XcodeProjectInfo } from '../../types/index.js';
+import { getSimulatorPlatformSDK } from '../../utils/getPlatformInfo.js';
 import { buildProject } from '../build/buildProject.js';
 import { getBuildPath } from './getBuildPath.js';
 import { getBuildSettings } from './getBuildSettings.js';
@@ -12,7 +13,7 @@ export async function runOnMac(
   scheme: string,
   args: RunFlags
 ) {
-  const buildOutput = await buildProject(
+  await buildProject(
     xcodeProject,
     sourceDir,
     'macos',
@@ -23,7 +24,6 @@ export async function runOnMac(
   );
 
   await openApp({
-    buildOutput,
     xcodeProject,
     sourceDir,
     configuration,
@@ -34,7 +34,6 @@ export async function runOnMac(
 }
 
 type Options = {
-  buildOutput: string;
   xcodeProject: XcodeProjectInfo;
   sourceDir: string;
   configuration: string;
@@ -44,7 +43,6 @@ type Options = {
 };
 
 async function openApp({
-  buildOutput,
   xcodeProject,
   sourceDir,
   configuration,
@@ -58,7 +56,7 @@ async function openApp({
     xcodeProject,
     sourceDir,
     configuration,
-    buildOutput,
+    getSimulatorPlatformSDK('macos'),
     scheme,
     target
   );

packages/platform-apple-helpers/src/lib/commands/run/runOnMacCatalyst.ts

@@ -1,5 +1,6 @@
 import { spawn } from '@rnef/tools';
 import type { ApplePlatform, XcodeProjectInfo } from '../../types/index.js';
+import { getSimulatorPlatformSDK } from '../../utils/getPlatformInfo.js';
 import { buildProject } from '../build/buildProject.js';
 import { getBuildPath } from './getBuildPath.js';
 import { getBuildSettings } from './getBuildSettings.js';
@@ -18,7 +19,7 @@ export async function runOnMacCatalyst(
       'The "--binary-path" flag is not supported for Mac Catalyst device.'
     );
   }
-  const buildOutput = await buildProject(
+  await buildProject(
     xcodeProject,
     sourceDir,
     platform,
@@ -32,7 +33,7 @@ export async function runOnMacCatalyst(
     xcodeProject,
     sourceDir,
     configuration,
-    buildOutput,
+    getSimulatorPlatformSDK(platform),
     scheme
   );
 

packages/platform-apple-helpers/src/lib/utils/getPlatformInfo.ts

@@ -29,3 +29,38 @@ export function getPlatformInfo(platform: ApplePlatform): PlatformInfo {
       };
   }
 }
+
+export type PlatformSDK =
+  | 'iphonesimulator'
+  | 'macosx'
+  | 'appletvsimulator'
+  | 'xrsimulator'
+  | 'iphoneos'
+  | 'appletvos'
+  | 'xr';
+
+export function getSimulatorPlatformSDK(platform: ApplePlatform): PlatformSDK {
+  switch (platform) {
+    case 'ios':
+      return 'iphonesimulator';
+    case 'macos':
+      return 'macosx';
+    case 'tvos':
+      return 'appletvsimulator';
+    case 'visionos':
+      return 'xrsimulator';
+  }
+}
+
+export function getDevicePlatformSDK(platform: ApplePlatform): PlatformSDK {
+  switch (platform) {
+    case 'ios':
+      return 'iphoneos';
+    case 'macos':
+      return 'macosx';
+    case 'tvos':
+      return 'appletvos';
+    case 'visionos':
+      return 'xr';
+  }
+}