@nrwl/react-native 15.9.0-beta.9 → 15.9.0-rc.0

package/src/executors/build-ios/build-ios.impl.ts

@@ -0,0 +1,118 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { join } from 'path';
+import { ChildProcess, fork } from 'child_process';
+import { platform } from 'os';
+
+import { ensureNodeModulesSymlink } from '../../utils/ensure-node-modules-symlink';
+import {
+  displayNewlyAddedDepsMessage,
+  syncDeps,
+} from '../sync-deps/sync-deps.impl';
+import { podInstall } from '../../utils/pod-install-task';
+import { ReactNativeBuildIosOptions } from './schema';
+import { runCliStart } from '../start/start.impl';
+import { getCliOptions } from '../../utils/get-cli-options';
+
+export interface ReactNativeBuildIosOutput {
+  success: boolean;
+}
+
+let childProcess: ChildProcess;
+
+export default async function* runIosExecutor(
+  options: ReactNativeBuildIosOptions,
+  context: ExecutorContext
+): AsyncGenerator<ReactNativeBuildIosOutput> {
+  if (platform() !== 'darwin') {
+    throw new Error(`The run-ios build requires Mac to run`);
+  }
+  const projectRoot =
+    context.projectsConfigurations.projects[context.projectName].root;
+  ensureNodeModulesSymlink(context.root, projectRoot);
+  if (options.sync) {
+    displayNewlyAddedDepsMessage(
+      context.projectName,
+      await syncDeps(
+        context.projectName,
+        projectRoot,
+        context.root,
+        context.projectGraph
+      )
+    );
+  }
+
+  if (options.install) {
+    await podInstall(
+      join(context.root, projectRoot, 'ios'),
+      options.buildFolder
+    );
+  }
+
+  try {
+    const tasks = [runCliBuildIOS(context.root, projectRoot, options)];
+    if (options.packager && options.mode !== 'Release') {
+      tasks.push(
+        runCliStart(context.root, projectRoot, {
+          port: options.port,
+          resetCache: options.resetCache,
+          interactive: options.interactive,
+        })
+      );
+    }
+
+    await Promise.all(tasks);
+
+    yield { success: true };
+  } finally {
+    if (childProcess) {
+      childProcess.kill();
+    }
+  }
+}
+
+function runCliBuildIOS(
+  workspaceRoot: string,
+  projectRoot: string,
+  options: ReactNativeBuildIosOptions
+) {
+  return new Promise((resolve, reject) => {
+    /**
+     * Call the react native cli with option `--no-packager`
+     * Not passing '--packager' due to cli will launch start command from the project root
+     */
+    childProcess = fork(
+      join(workspaceRoot, './node_modules/react-native/cli.js'),
+      ['run-ios', ...createBuildIOSOptions(options), '--no-packager'],
+      {
+        cwd: join(workspaceRoot, projectRoot),
+        env: { ...process.env, RCT_METRO_PORT: options.port.toString() },
+      }
+    );
+
+    // Ensure the child process is killed when the parent exits
+    process.on('exit', () => childProcess.kill());
+    process.on('SIGTERM', () => childProcess.kill());
+
+    childProcess.on('error', (err) => {
+      reject(err);
+    });
+    childProcess.on('exit', (code) => {
+      if (code === 0) {
+        resolve(code);
+      } else {
+        reject(code);
+      }
+    });
+  });
+}
+
+const nxOptions = ['sync', 'install', 'packager'];
+const startOptions = ['port', 'resetCache'];
+
+function createBuildIOSOptions(options: ReactNativeBuildIosOptions) {
+  return getCliOptions<ReactNativeBuildIosOptions>(
+    options,
+    [...nxOptions, ...startOptions],
+    ['buildFolder']
+  );
+}

package/src/executors/build-ios/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/build-ios/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const build_ios_impl_1 = require("./build-ios.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(build_ios_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/build-ios/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/build-ios/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,qDAAgD;AAEhD,kBAAe,IAAA,0BAAiB,EAAC,wBAAgB,CAAC,CAAC"}

package/src/executors/build-ios/schema.d.ts

@@ -0,0 +1,22 @@
+// options from https://github.com/react-native-community/cli/blob/main/packages/cli-platform-ios/src/commands/buildIOS/index.ts
+
+import { ReactNativeStartOptions } from '../start/schema';
+
+export interface ReactNativeBuildIosOptions extends ReactNativeStartOptions {
+  // react native options
+  simulator?: string;
+  mode: string; // default if 'Debug'
+  scheme?: string;
+  device?: string;
+  udid?: string;
+  verbose?: boolean;
+  port: number; // default is 8081
+  xcconfig?: string;
+  buildFolder?: string;
+  extraParams?: string;
+
+  // nx options
+  packager: boolean; // default is true
+  install: boolean; // default is true
+  sync: boolean; // default is true
+}

package/src/executors/build-ios/schema.json

@@ -0,0 +1,106 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "version": 2,
+  "cli": "nx",
+  "title": "React Native Build iOS executor",
+  "description": "Build iOS app.",
+  "type": "object",
+  "presets": [
+    {
+      "name": "Build iOS for a simulator",
+      "keys": ["simulator"]
+    },
+    {
+      "name": "Build iOS for a device",
+      "keys": ["device"]
+    },
+    {
+      "name": "Build iOS for a device with udid",
+      "keys": ["udid"]
+    },
+    {
+      "name": "Run `pod install` before building iOS app",
+      "keys": ["install"]
+    }
+  ],
+  "properties": {
+    "simulator": {
+      "type": "string",
+      "description": "Explicitly set simulator to use. Optionally include iOS version between parenthesis at the end to match an exact version: \"iPhone 6 (10.0)\"",
+      "examples": [
+        "iPhone 14",
+        "iPhone 13",
+        "iPhone 12",
+        "iPhone 11",
+        "iPhone X"
+      ],
+      "x-priority": "important"
+    },
+    "mode": {
+      "type": "string",
+      "description": "Explicitly set the scheme configuration to use",
+      "default": "Debug",
+      "examples": ["Debug", "Release"],
+      "x-priority": "important"
+    },
+    "schema": {
+      "type": "string",
+      "description": "Explicitly set Xcode scheme to use"
+    },
+    "device": {
+      "type": "string",
+      "description": "Explicitly set device to use by name. The value is not required if you have a single device connected."
+    },
+    "udid": {
+      "type": "string",
+      "description": "Explicitly set device to use by udid"
+    },
+    "verbose": {
+      "type": "boolean",
+      "description": "Do not use xcbeautify or xcpretty even if installed"
+    },
+    "port": {
+      "type": "number",
+      "description": "The port where the packager server is listening on.",
+      "default": 8081
+    },
+    "xcconfig": {
+      "type": "string",
+      "description": "Explicitly set xcconfig to use"
+    },
+    "buildFolder": {
+      "type": "string",
+      "description": "Location for iOS build artifacts. Corresponds to Xcode's \"-derivedDataPath\". Relative to ios directory",
+      "default": "./build"
+    },
+    "interactive": {
+      "type": "boolean",
+      "description": "Explicitly select which scheme and configuration to use before running a build"
+    },
+    "extraParams": {
+      "type": "string",
+      "description": "Custom params that will be passed to xcodebuild command."
+    },
+    "install": {
+      "type": "boolean",
+      "description": "Runs `pod install` for native modules before building iOS app."
+    },
+    "sync": {
+      "type": "boolean",
+      "description": "Syncs npm dependencies to `package.json` (for React Native autolink).",
+      "default": true
+    },
+    "resetCache": {
+      "type": "boolean",
+      "description": "Resets metro cache.",
+      "default": false
+    },
+    "packager": {
+      "type": "boolean",
+      "description": "Launch packager while building",
+      "default": true
+    }
+  },
+  "required": [],
+  "examplesFile": "../../../docs/build-ios-examples.md"
+}

package/src/executors/bundle/schema.json

@@ -7,6 +7,24 @@
   "title": "Offline JS Bundle for React Native",
   "description": "JS Bundle target options.",
   "type": "object",
+  "presets": [
+    {
+      "name": "Bundle for a specific platform",
+      "keys": ["platform"]
+    },
+    {
+      "name": "Bundle a development build",
+      "keys": ["dev"]
+    },
+    {
+      "name": "Bundle to a specific output path",
+      "keys": ["bundleOutput"]
+    },
+    {
+      "name": "Bundle without global cache",
+      "keys": ["resetCache"]
+    }
+  ],
   "properties": {
     "entryFile": {
       "type": "string",
@@ -65,7 +83,7 @@
     },
     "readGlobalCache": {
       "type": "boolean",
-      "description": "Removes cached files.",
+      "description": "Try to fetch transformed JS code from the global cache, if configured.",
       "default": false
     }
   },

package/src/executors/pod-install/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/pod-install/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const pod_install_impl_1 = require("./pod-install.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(pod_install_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/pod-install/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/pod-install/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AAEjD,yDAA4C;AAE5C,kBAAe,IAAA,0BAAiB,EAAC,0BAAU,CAAC,CAAC"}

package/src/executors/pod-install/pod-install.impl.d.ts

@@ -0,0 +1,6 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { ReactNativePodInstallOptions } from './schema';
+export interface ReactNativePodInstallOutput {
+    success: boolean;
+}
+export default function podInstall(options: ReactNativePodInstallOptions, context: ExecutorContext): AsyncGenerator<ReactNativePodInstallOutput>;

package/src/executors/pod-install/pod-install.impl.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path_1 = require("path");
+const pod_install_task_1 = require("../../utils/pod-install-task");
+function podInstall(options, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* podInstall_1() {
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+        const iosDirectory = (0, path_1.join)(context.root, projectRoot, 'ios');
+        yield tslib_1.__await((0, pod_install_task_1.runPodInstall)(iosDirectory, true, options.buildFolder)());
+        yield yield tslib_1.__await({ success: true });
+    });
+}
+exports.default = podInstall;
+//# sourceMappingURL=pod-install.impl.js.map

package/src/executors/pod-install/pod-install.impl.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pod-install.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/pod-install/pod-install.impl.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAG5B,mEAA6D;AAO7D,SAA+B,UAAU,CACvC,OAAqC,EACrC,OAAwB;;QAExB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACpE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5D,sBAAM,IAAA,gCAAa,EAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,EAAE,CAAA,CAAC;QAE/D,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;IAC1B,CAAC;CAAA;AAVD,6BAUC"}

package/src/executors/pod-install/pod-install.impl.ts

@@ -0,0 +1,21 @@
+import { join } from 'path';
+import { ExecutorContext } from '@nrwl/devkit';
+
+import { runPodInstall } from '../../utils/pod-install-task';
+import { ReactNativePodInstallOptions } from './schema';
+
+export interface ReactNativePodInstallOutput {
+  success: boolean;
+}
+
+export default async function* podInstall(
+  options: ReactNativePodInstallOptions,
+  context: ExecutorContext
+): AsyncGenerator<ReactNativePodInstallOutput> {
+  const projectRoot =
+    context.projectsConfigurations.projects[context.projectName].root;
+  const iosDirectory = join(context.root, projectRoot, 'ios');
+  await runPodInstall(iosDirectory, true, options.buildFolder)();
+
+  yield { success: true };
+}

package/src/executors/pod-install/schema.d.ts

@@ -0,0 +1,3 @@
+export interface ReactNativePodInstallOptions {
+  buildFolder: string;
+}

package/src/executors/pod-install/schema.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "outputCapture": "direct-nodejs",
+  "cli": "nx",
+  "$id": "NxReactNativePodInstall",
+  "$schema": "http://json-schema.org/schema",
+  "title": "Run Pod Install for React Native iOS Project",
+  "description": "Run `pod install` for React Native iOS Project.",
+  "type": "object",
+  "properties": {
+    "buildFolder": {
+      "description": "Location for iOS build artifacts. Corresponds to Xcode's \"-derivedDataPath\". Relative to ios directory",
+      "type": "string",
+      "default": "./build"
+    }
+  },
+  "required": ["buildFolder"]
+}

package/src/executors/run-android/run-android.impl.js

@@ -7,6 +7,7 @@ const ensure_node_modules_symlink_1 = require("../../utils/ensure-node-modules-s
 const sync_deps_impl_1 = require("../sync-deps/sync-deps.impl");
 const start_impl_1 = require("../start/start.impl");
 const chmod_android_gradle_files_1 = require("../../utils/chmod-android-gradle-files");
+const get_cli_options_1 = require("../../utils/get-cli-options");
 let childProcess;
 function runAndroidExecutor(options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* runAndroidExecutor_1() {
@@ -62,34 +63,10 @@ function runCliRunAndroid(workspaceRoot, projectRoot, options) {
         });
     });
 }
-const nxOrStartOptions = [
-    'sync',
-    'install',
-    'packager',
-    'port',
-    'resetCache',
-    'interactive',
-];
+const nxOptions = ['sync', 'packager'];
+const startOptions = ['port', 'resetCache'];
+const deprecatedOptions = ['variant', 'jetifier'];
 function createRunAndroidOptions(options) {
-    return Object.keys(options).reduce((acc, k) => {
-        const v = options[k];
-        if (k === 'mainActivity') {
-            acc.push(`--main-activity`, v);
-        }
-        else if (k === 'jetifier') {
-            if (!v) {
-                acc.push(`--no-jetifier`);
-            }
-        }
-        else if (k === 'activeArchOnly') {
-            if (v) {
-                acc.push(`--active-arch-only`);
-            }
-        }
-        else if (v && !nxOrStartOptions.includes(k)) {
-            acc.push(`--${k}`, v);
-        }
-        return acc;
-    }, []);
+    return (0, get_cli_options_1.getCliOptions)(options, [...nxOptions, ...startOptions, ...deprecatedOptions], ['appId', 'appIdSuffix']);
 }
 //# sourceMappingURL=run-android.impl.js.map

package/src/executors/run-android/run-android.impl.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-android/run-android.impl.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,iDAAmD;AAEnD,yFAAmF;AACnF,gEAGqC;AAGrC,oDAAkD;AAClD,uFAAkF;AAMlF,IAAI,YAA0B,CAAC;AAE/B,SAA+B,kBAAkB,CAC/C,OAAqC,EACrC,OAAwB;;QAExB,MAAM,WAAW,GACf,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC;QACpE,IAAA,sDAAwB,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QACpD,IAAA,qDAAwB,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;QAEvD,IAAI,OAAO,CAAC,IAAI,EAAE;YAChB,IAAA,6CAA4B,EAC1B,OAAO,CAAC,WAAW,EACnB,sBAAM,IAAA,yBAAQ,EACZ,OAAO,CAAC,WAAW,EACnB,WAAW,EACX,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,YAAY,CACrB,CAAA,CACF,CAAC;SACH;QAED,IAAI;YACF,MAAM,KAAK,GAAG,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;YACrE,IAAI,OAAO,CAAC,QAAQ,EAAE;gBACpB,KAAK,CAAC,IAAI,CACR,IAAA,wBAAW,EAAC,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE;oBACrC,IAAI,EAAE,OAAO,CAAC,IAAI;oBAClB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;iBACjC,CAAC,CACH,CAAC;aACH;YAED,sBAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA,CAAC;YAEzB,4BAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA,CAAC;SACzB;gBAAS;YACR,IAAI,YAAY,EAAE;gBAChB,YAAY,CAAC,IAAI,EAAE,CAAC;aACrB;SACF;IACH,CAAC;CAAA;AAzCD,qCAyCC;AAED,SAAS,gBAAgB,CACvB,aAAqB,EACrB,WAAmB,EACnB,OAAqC;IAErC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC;;;WAGG;QACH,YAAY,GAAG,IAAA,oBAAI,EACjB,IAAA,WAAI,EAAC,aAAa,EAAE,oCAAoC,CAAC,EACzD,CAAC,aAAa,EAAE,GAAG,uBAAuB,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,EACrE;YACE,GAAG,EAAE,IAAA,WAAI,EAAC,aAAa,EAAE,WAAW,CAAC;YACrC,GAAG,kCAAO,OAAO,CAAC,GAAG,KAAE,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAE;SACjE,CACF,CAAC;QAEF,2DAA2D;QAC3D,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;QAEjD,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YAC/B,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,IAAI,KAAK,CAAC,EAAE;gBACd,OAAO,CAAC,IAAI,CAAC,CAAC;aACf;iBAAM;gBACL,MAAM,CAAC,IAAI,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,gBAAgB,GAAG;IACvB,MAAM;IACN,SAAS;IACT,UAAU;IACV,MAAM;IACN,YAAY;IACZ,aAAa;CACd,CAAC;AAEF,SAAS,uBAAuB,CAAC,OAAO;IACtC,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,KAAK,cAAc,EAAE;YACxB,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;SAChC;aAAM,IAAI,CAAC,KAAK,UAAU,EAAE;YAC3B,IAAI,CAAC,CAAC,EAAE;gBACN,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aAC3B;SACF;aAAM,IAAI,CAAC,KAAK,gBAAgB,EAAE;YACjC,IAAI,CAAC,EAAE;gBACL,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;aAChC;SACF;aAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;YAC7C,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACvB;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
+{"version":3,"file":"run-android.impl.js","sourceRoot":"","sources":["../../../../../../packages/react-native/src/executors/run-android/run-android.impl.ts"],"names":[],"mappings":"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"}

package/src/executors/run-android/run-android.impl.ts

@@ -7,10 +7,10 @@ import {
   displayNewlyAddedDepsMessage,
   syncDeps,
 } from '../sync-deps/sync-deps.impl';
-import { chmodSync } from 'fs';
 import { ReactNativeRunAndroidOptions } from './schema';
 import { runCliStart } from '../start/start.impl';
 import { chmodAndroidGradlewFiles } from '../../utils/chmod-android-gradle-files';
+import { getCliOptions } from '../../utils/get-cli-options';
 
 export interface ReactNativeRunAndroidOutput {
   success: boolean;
@@ -97,31 +97,14 @@ function runCliRunAndroid(
   });
 }
 
-const nxOrStartOptions = [
-  'sync',
-  'install',
-  'packager',
-  'port',
-  'resetCache',
-  'interactive',
-];
+const nxOptions = ['sync', 'packager'];
+const startOptions = ['port', 'resetCache'];
+const deprecatedOptions = ['variant', 'jetifier'];
 
-function createRunAndroidOptions(options) {
-  return Object.keys(options).reduce((acc, k) => {
-    const v = options[k];
-    if (k === 'mainActivity') {
-      acc.push(`--main-activity`, v);
-    } else if (k === 'jetifier') {
-      if (!v) {
-        acc.push(`--no-jetifier`);
-      }
-    } else if (k === 'activeArchOnly') {
-      if (v) {
-        acc.push(`--active-arch-only`);
-      }
-    } else if (v && !nxOrStartOptions.includes(k)) {
-      acc.push(`--${k}`, v);
-    }
-    return acc;
-  }, []);
+function createRunAndroidOptions(options: ReactNativeRunAndroidOptions) {
+  return getCliOptions<ReactNativeRunAndroidOptions>(
+    options,
+    [...nxOptions, ...startOptions, ...deprecatedOptions],
+    ['appId', 'appIdSuffix']
+  );
 }

package/src/executors/run-android/schema.d.ts

@@ -1,17 +1,24 @@
-// part of options from https://github.com/react-native-community/cli/blob/master/packages/platform-android/src/commands/runAndroid/index.ts#L314
-export interface ReactNativeRunAndroidOptions {
+import { ReactNativeBuildAndroidOptions } from '../build-android/schema';
+import { ReactNativeStartOptions } from '../start/schema';
+
+// part of options from https://github.com/react-native-community/cli/blob/main/packages/cli-platform-android/src/commands/runAndroid/index.ts
+export interface ReactNativeRunAndroidOptions
+  extends ReactNativeBuildAndroidOptions {
+  /**
+   * @deprecated use mode instead
+   */
   variant: string;
+  /**
+   * @deprecated no longer supported in react native cli
+   * https://github.com/react-native-community/cli/commit/7c003f2b1d9d80ec5c167614ba533a004272c685
+   */
+  jetifier: boolean;
+
+  // react native options
   appId: string;
   appIdSuffix: string;
   mainActiviy: string;
   deviceId: string;
-  tasks?: string;
-  jetifier: boolean;
-  sync: boolean;
-  port: number;
-  terminal?: string;
-  packager: boolean; // default is true
-  resetCache: boolean; // default is false
-  interactive: boolean; // default is true
-  activeArchOnly?: boolean;
+  listDevices?: boolean;
+  binaryPath?: string;
 }