feat: add --target option (#1928)

* feat: add `--target` option * Update packages/cli-platform-ios/src/commands/runIOS/index.ts Co-authored-by: Michał Pierzchała <thymikee@gmail.com> * fix: delete ability to select target from interactive mode --------- Co-authored-by: Michał Pierzchała <thymikee@gmail.com>
react-native-community · May 19, 2023 · 0afde11 · 0afde11
1 parent 29c7ea0
commit 0afde11
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 15 deletions.
diff --git a/packages/cli-platform-ios/README.md b/packages/cli-platform-ios/README.md
@@ -61,6 +61,10 @@ react-native run-ios --mode "Release"
 
 Explicitly set Xcode scheme to use.
 
+#### `--target <string>`
+
+Explicitly set Xcode target to use.
+
 #### `--device [string]`
 
 Explicitly set device to use by name. The value is not required if you have a single device connected.
@@ -155,6 +159,10 @@ react-native build-ios --mode "Release"
 
 Explicitly set Xcode scheme to use.
 
+#### `--target <string>`
+
+Explicitly set Xcode target to use.
+
 #### `--device [string]`
 
 Explicitly set device to use by name. The value is not required if you have a single device connected.

diff --git a/packages/cli-platform-ios/src/commands/buildIOS/buildProject.ts b/packages/cli-platform-ios/src/commands/buildIOS/buildProject.ts
@@ -13,6 +13,7 @@ import {
 
 export type BuildFlags = {
   mode: string;
+  target: string;
   packager: boolean;
   verbose: boolean;
   xcconfig?: string;

diff --git a/packages/cli-platform-ios/src/commands/buildIOS/index.ts b/packages/cli-platform-ios/src/commands/buildIOS/index.ts
@@ -265,6 +265,10 @@ export const iosBuildOptions = [
     description: 'Custom params that will be passed to xcodebuild command.',
     parse: (val: string) => val.split(' '),
   },
+  {
+    name: '--target <string>',
+    description: 'Explicitly set Xcode target to use.',
+  },
 ];
 
 export default {

diff --git a/packages/cli-platform-ios/src/commands/runIOS/index.ts b/packages/cli-platform-ios/src/commands/runIOS/index.ts
@@ -291,11 +291,12 @@ async function runOnSimulator(
       args,
     );
 
-    appPath = getBuildPath(
+    appPath = await getBuildPath(
       xcodeProject,
       args.mode || args.configuration,
       buildOutput,
       scheme,
+      args.target,
     );
   } else {
     appPath = args.binaryPath;
@@ -372,11 +373,12 @@ async function runOnDevice(
       args,
     );
 
-    const appPath = getBuildPath(
+    const appPath = await getBuildPath(
       xcodeProject,
       args.mode || args.configuration,
       buildOutput,
       scheme,
+      args.target,
       true,
     );
     const appProcess = child_process.spawn(`${appPath}/${scheme}`, [], {
@@ -394,11 +396,12 @@ async function runOnDevice(
         args,
       );
 
-      appPath = getBuildPath(
+      appPath = await getBuildPath(
         xcodeProject,
         args.mode || args.configuration,
         buildOutput,
         scheme,
+        args.target,
       );
     } else {
       appPath = args.binaryPath;
@@ -437,29 +440,53 @@ function bootSimulator(selectedSimulator: Device) {
   child_process.spawnSync('xcrun', ['simctl', 'boot', selectedSimulator.udid]);
 }
 
-function getTargetPaths(buildSettings: string) {
+async function getTargetPaths(
+  buildSettings: string,
+  scheme: string,
+  target: string | undefined,
+) {
   const settings = JSON.parse(buildSettings);
 
-  // Find app in all building settings - look for WRAPPER_EXTENSION: 'app',
-  for (const i in settings) {
-    const wrapperExtension = settings[i].buildSettings.WRAPPER_EXTENSION;
-
-    if (wrapperExtension === 'app') {
-      return {
-        targetBuildDir: settings[i].buildSettings.TARGET_BUILD_DIR,
-        executableFolderPath: settings[i].buildSettings.EXECUTABLE_FOLDER_PATH,
-      };
+  const targets = settings.map(({target}: any) => target);
+
+  let selectedTarget = targets[0];
+
+  if (target) {
+    if (!targets.includes(target)) {
+      logger.info(
+        `Target ${chalk.bold(target)} not found for scheme ${chalk.bold(
+          scheme,
+        )}, automatically selected target ${chalk.bold(selectedTarget)}`,
+      );
+    } else {
+      selectedTarget = target;
     }
   }
 
+  // Find app in all building settings - look for WRAPPER_EXTENSION: 'app',
+
+  const targetIndex = targets.indexOf(selectedTarget);
+
+  const wrapperExtension =
+    settings[targetIndex].buildSettings.WRAPPER_EXTENSION;
+
+  if (wrapperExtension === 'app') {
+    return {
+      targetBuildDir: settings[targetIndex].buildSettings.TARGET_BUILD_DIR,
+      executableFolderPath:
+        settings[targetIndex].buildSettings.EXECUTABLE_FOLDER_PATH,
+    };
+  }
+
   return {};
 }
 
-function getBuildPath(
+async function getBuildPath(
   xcodeProject: IOSProjectInfo,
   mode: BuildFlags['mode'],
   buildOutput: string,
   scheme: string,
+  target: string,
   isCatalyst: boolean = false,
 ) {
   const buildSettings = child_process.execFileSync(
@@ -478,7 +505,12 @@ function getBuildPath(
     ],
     {encoding: 'utf8'},
   );
-  const {targetBuildDir, executableFolderPath} = getTargetPaths(buildSettings);
+
+  const {targetBuildDir, executableFolderPath} = await getTargetPaths(
+    buildSettings,
+    scheme,
+    target,
+  );
 
   if (!targetBuildDir) {
     throw new CLIError('Failed to get the target build directory.');