@rnx-kit/cli 0.17.3 → 0.17.5

package/lib/bin/context.d.ts

@@ -20,6 +20,6 @@ export declare function getCoreCommands(): {
     options?: import("@react-native-community/cli-types").CommandOption<(ctx: BaseConfig) => import("@react-native-community/cli-types").OptionValue>[] | undefined;
 }[];
 export declare function uniquify(commands: Command[]): Command[];
-export declare function loadContext(userCommand: string, root?: string): Config;
+export declare function loadContextForCommand(userCommand: string, root?: string): Config;
 export {};
 //# sourceMappingURL=context.d.ts.map

package/lib/bin/context.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCoreCommands = getCoreCommands;
 exports.uniquify = uniquify;
-exports.loadContext = loadContext;
+exports.loadContextForCommand = loadContextForCommand;
 const package_1 = require("@rnx-kit/tools-node/package");
 const cache_1 = require("@rnx-kit/tools-react-native/cache");
 const context_1 = require("@rnx-kit/tools-react-native/context");
@@ -39,7 +39,7 @@ function uniquify(commands) {
     }
     return Object.values(uniqueCommands);
 }
-function loadContext(userCommand, root = process.cwd()) {
+function loadContextForCommand(userCommand, root = process.cwd()) {
     // The fast path avoids traversing project dependencies because we know what
     // information our commands depend on.
     const coreCommands = getCoreCommands();
@@ -76,7 +76,8 @@ function loadContext(userCommand, root = process.cwd()) {
                 throw new Error("Unexpected access to `platforms`");
             },
             get project() {
-                throw new Error("Unexpected access to `project`");
+                // Used by the build command
+                return (0, context_1.loadContext)(root).project;
             },
         };
     }

package/lib/bin/rnx-cli.js

@@ -30,7 +30,7 @@ const context_1 = require("./context");
 const externalCommands_1 = require("./externalCommands");
 function main() {
     const [, , userCommand] = process.argv;
-    const context = (0, context_1.loadContext)(userCommand);
+    const context = (0, context_1.loadContextForCommand)(userCommand);
     const allCommands = context.commands.concat((0, externalCommands_1.findExternalCommands)(context));
     const program = new commander_1.Command(path.basename(__filename, ".js"));
     for (const { name, description, detached, options = [], func, } of allCommands) {

package/lib/build/android.d.ts

@@ -0,0 +1,6 @@
+import type { Config } from "@react-native-community/cli-types";
+import ora from "ora";
+import type { AndroidBuildParams } from "./types";
+export type BuildResult = string | number | null;
+export declare function buildAndroid(config: Config, buildParams: AndroidBuildParams, logger?: ora.Ora): Promise<BuildResult>;
+//# sourceMappingURL=android.d.ts.map

package/lib/build/android.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAndroid = buildAndroid;
+const ora_1 = __importDefault(require("ora"));
+const watcher_1 = require("./watcher");
+function buildAndroid(config, buildParams, logger = (0, ora_1.default)()) {
+    const { sourceDir } = config.project.android ?? {};
+    if (!sourceDir) {
+        logger.fail("No Android project was found");
+        process.exitCode = 1;
+        return Promise.resolve(null);
+    }
+    return import("@rnx-kit/tools-android").then(({ assemble }) => {
+        return new Promise((resolve) => {
+            const gradle = assemble(sourceDir, buildParams);
+            (0, watcher_1.watch)(gradle, logger, () => resolve(sourceDir), resolve);
+        });
+    });
+}
+//# sourceMappingURL=android.js.map

package/lib/build/apple.d.ts

@@ -1,28 +1,9 @@
 import type { Ora } from "ora";
-export type DeviceType = "device" | "emulator" | "simulator";
-export type BuildConfiguration = "Debug" | "Release";
-type BuildParams = {
-    platform: "ios" | "visionos";
-    scheme?: string;
-    destination?: DeviceType;
-    configuration?: BuildConfiguration;
-    archs?: string;
-    isBuiltRemotely?: boolean;
-} | {
-    platform: "macos";
-    scheme?: string;
-    configuration?: BuildConfiguration;
-    isBuiltRemotely?: boolean;
-};
+import type { AppleBuildParams } from "./types";
 export type BuildArgs = {
     xcworkspace: string;
     args: string[];
 };
 export type BuildResult = BuildArgs | number | null;
-export type InputParams = BuildParams & {
-    device?: string;
-    workspace?: string;
-};
-export declare function runBuild(xcworkspace: string, buildParams: BuildParams, logger: Ora): Promise<BuildResult>;
-export {};
+export declare function runBuild(xcworkspace: string, buildParams: AppleBuildParams, logger: Ora): Promise<BuildResult>;
 //# sourceMappingURL=apple.d.ts.map

package/lib/build/apple.js

@@ -1,29 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runBuild = runBuild;
+const watcher_1 = require("./watcher");
 function runBuild(xcworkspace, buildParams, logger) {
     return import("@rnx-kit/tools-apple").then(({ xcodebuild }) => {
         return new Promise((resolve) => {
-            logger.start("Building...");
-            const errors = [];
-            const proc = xcodebuild(xcworkspace, buildParams, (text) => {
-                const current = logger.text;
+            const onSuccess = () => resolve({ xcworkspace, args: build.spawnargs });
+            const build = xcodebuild(xcworkspace, buildParams, (text) => {
                 logger.info(text);
-                logger.start(current);
-            });
-            proc.stdout.on("data", () => (logger.text += "."));
-            proc.stderr.on("data", (data) => errors.push(data));
-            proc.on("close", (code) => {
-                if (code === 0) {
-                    logger.succeed("Build succeeded");
-                    resolve({ xcworkspace, args: proc.spawnargs });
-                }
-                else {
-                    logger.fail(Buffer.concat(errors).toString());
-                    process.exitCode = code ?? 1;
-                    resolve(code);
-                }
             });
+            (0, watcher_1.watch)(build, logger, onSuccess, resolve);
         });
     });
 }

package/lib/build/ios.d.ts

@@ -1,5 +1,6 @@
 import type { Config } from "@react-native-community/cli-types";
 import ora from "ora";
-import type { BuildResult, InputParams } from "./apple";
-export declare function buildIOS(config: Config, buildParams: InputParams, logger?: ora.Ora): Promise<BuildResult>;
+import type { BuildResult } from "./apple";
+import type { AppleInputParams } from "./types";
+export declare function buildIOS(config: Config, buildParams: AppleInputParams, logger?: ora.Ora): Promise<BuildResult>;
 //# sourceMappingURL=ios.d.ts.map

package/lib/build/macos.d.ts

@@ -1,5 +1,6 @@
 import type { Config } from "@react-native-community/cli-types";
 import ora from "ora";
-import type { BuildResult, InputParams } from "./apple";
-export declare function buildMacOS(_config: Config, { workspace, ...buildParams }: InputParams, logger?: ora.Ora): Promise<BuildResult>;
+import type { BuildResult } from "./apple";
+import type { AppleInputParams } from "./types";
+export declare function buildMacOS(_config: Config, { workspace, ...buildParams }: AppleInputParams, logger?: ora.Ora): Promise<BuildResult>;
 //# sourceMappingURL=macos.d.ts.map

package/lib/build/types.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Copy of types from `@rnx-kit/tools-apple`. If Jest wasn't such a pain to
+ * configure, we would have added an `import type` at the top instead:
+ *
+ *     import type { BuildParams as AndroidBuildParams } from "@rnx-kit/tools-android" with { "resolution-mode": "import" };
+ *     import type { BuildParams as AppleBuildParams } from "@rnx-kit/tools-apple" with { "resolution-mode": "import" };
+ *
+ * But Jest doesn't like import attributes and it doesn't matter if we add
+ * `@babel/plugin-syntax-import-attributes` in the config.
+ *
+ * TOOD: Remove this file when we can migrate away from Jest in this package.
+ */
+export type DeviceType = "device" | "emulator" | "simulator";
+export type BuildConfiguration = "Debug" | "Release";
+export type AndroidBuildParams = {
+    platform: "android";
+    destination?: DeviceType;
+    configuration?: BuildConfiguration;
+    archs?: string;
+};
+export type AppleBuildParams = {
+    platform: "ios" | "visionos";
+    scheme?: string;
+    destination?: DeviceType;
+    configuration?: BuildConfiguration;
+    archs?: string;
+    isBuiltRemotely?: boolean;
+} | {
+    platform: "macos";
+    scheme?: string;
+    configuration?: BuildConfiguration;
+    isBuiltRemotely?: boolean;
+};
+export type AndroidInputParams = AndroidBuildParams & {
+    device?: string;
+};
+export type AppleInputParams = AppleBuildParams & {
+    device?: string;
+    workspace?: string;
+};
+export type InputParams = AndroidInputParams | AppleInputParams;
+//# sourceMappingURL=types.d.ts.map

package/lib/build/types.js

@@ -0,0 +1,15 @@
+"use strict";
+/**
+ * Copy of types from `@rnx-kit/tools-apple`. If Jest wasn't such a pain to
+ * configure, we would have added an `import type` at the top instead:
+ *
+ *     import type { BuildParams as AndroidBuildParams } from "@rnx-kit/tools-android" with { "resolution-mode": "import" };
+ *     import type { BuildParams as AppleBuildParams } from "@rnx-kit/tools-apple" with { "resolution-mode": "import" };
+ *
+ * But Jest doesn't like import attributes and it doesn't matter if we add
+ * `@babel/plugin-syntax-import-attributes` in the config.
+ *
+ * TOOD: Remove this file when we can migrate away from Jest in this package.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/lib/build/watcher.d.ts

@@ -0,0 +1,4 @@
+import type { ChildProcessWithoutNullStreams } from "node:child_process";
+import type { Ora } from "ora";
+export declare function watch(subproc: ChildProcessWithoutNullStreams, logger: Ora, onSuccess: () => void, onFail: (exitCode: number | null) => void): void;
+//# sourceMappingURL=watcher.d.ts.map

package/lib/build/watcher.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.watch = watch;
+function watch(subproc, logger, onSuccess, onFail) {
+    subproc.stdout.on("data", () => (logger.text += "."));
+    const errors = [];
+    subproc.stderr.on("data", (data) => errors.push(data));
+    subproc.on("close", (code) => {
+        if (code === 0) {
+            logger.succeed("Build succeeded");
+            onSuccess();
+        }
+        else {
+            logger.fail(Buffer.concat(errors).toString());
+            process.exitCode = code ?? 1;
+            onFail(code);
+        }
+    });
+    logger.info(`Command: ${subproc.spawnargs.join(" ")}`);
+    logger.start("Building");
+}
+//# sourceMappingURL=watcher.js.map

package/lib/build.d.ts

@@ -1,9 +1,9 @@
 import type { Config } from "@react-native-community/cli-types";
-import type { BuildConfiguration, DeviceType, InputParams } from "./build/apple";
+import type { BuildConfiguration, DeviceType, InputParams } from "./build/types";
 declare function asConfiguration(configuration: string): BuildConfiguration;
 declare function asDestination(destination: string): DeviceType;
 declare function asSupportedPlatform(platform: string): InputParams["platform"];
-export declare function rnxBuild(_argv: string[], config: Config, buildParams: InputParams): Promise<import("./build/apple").BuildResult>;
+export declare function rnxBuild(_argv: string[], config: Config, buildParams: InputParams): Promise<import("./build/android").BuildResult> | Promise<import("./build/apple").BuildResult>;
 export declare const rnxBuildCommand: {
     name: string;
     description: string;

package/lib/build.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rnxBuildCommand = void 0;
 exports.rnxBuild = rnxBuild;
 const commander_1 = require("commander");
+const android_1 = require("./build/android");
 const ios_1 = require("./build/ios");
 const macos_1 = require("./build/macos");
 function asConfiguration(configuration) {
@@ -26,16 +27,19 @@ function asDestination(destination) {
 }
 function asSupportedPlatform(platform) {
     switch (platform) {
+        case "android":
         case "ios":
         case "macos":
         case "visionos":
             return platform;
         default:
-            throw new commander_1.InvalidArgumentError("Supported platforms: 'ios', 'macos', 'visionos'.");
+            throw new commander_1.InvalidArgumentError("Supported platforms: 'android', 'ios', 'macos', 'visionos'.");
     }
 }
 function rnxBuild(_argv, config, buildParams) {
     switch (buildParams.platform) {
+        case "android":
+            return (0, android_1.buildAndroid)(config, buildParams);
         case "ios":
         case "visionos":
             return (0, ios_1.buildIOS)(config, buildParams);
@@ -49,7 +53,7 @@ exports.rnxBuildCommand = {
     func: rnxBuild,
     options: [
         {
-            name: "--platform <string>",
+            name: "-p, --platform <string>",
             description: "Target platform",
             parse: asSupportedPlatform,
         },
@@ -59,7 +63,7 @@ exports.rnxBuildCommand = {
         },
         {
             name: "--scheme <string>",
-            description: "Name of scheme to build",
+            description: "Name of scheme to build (Apple platforms only)",
         },
         {
             name: "--configuration <string>",

package/lib/bundle/kit-config.d.ts

@@ -19,5 +19,5 @@ export declare function getTargetPlatforms(overridePlatform?: AllPlatforms, targ
  * @param overridePlatform Override platform, typically from the command-line. When given, this overrides the list of target platforms.
  * @returns Array of platform-specific bundle configurations
  */
-export declare function getCliPlatformBundleConfigs(id?: string, overridePlatform?: AllPlatforms): CliPlatformBundleConfig[];
+export declare function getCliPlatformBundleConfigs(id?: string, overridePlatform?: AllPlatforms, kitConfig?: import("@rnx-kit/config").KitConfig | undefined): CliPlatformBundleConfig[];
 //# sourceMappingURL=kit-config.d.ts.map

package/lib/bundle/kit-config.js

@@ -39,8 +39,7 @@ function getDefaultBundleParameters(platform) {
  * @param overridePlatform Override platform, typically from the command-line. When given, this overrides the list of target platforms.
  * @returns Array of platform-specific bundle configurations
  */
-function getCliPlatformBundleConfigs(id, overridePlatform) {
-    const kitConfig = (0, config_1.getKitConfig)();
+function getCliPlatformBundleConfigs(id, overridePlatform, kitConfig = (0, config_1.getKitConfig)()) {
     const maybeBundleConfig = kitConfig
         ? (0, config_1.getBundleConfig)(kitConfig, id)
         : undefined;

package/lib/bundle/metro.d.ts

@@ -1,5 +1,6 @@
 import { bundle } from "@rnx-kit/metro-service";
 import type { ConfigT } from "metro-config";
+import * as nodefs from "node:fs";
 import type { CliPlatformBundleConfig } from "./types";
 /**
  * Run the Metro bundler.
@@ -13,5 +14,5 @@ import type { CliPlatformBundleConfig } from "./types";
  * @param minify Optionally choose whether or not the bundle is minified. When not set, minification is controlled by the `dev` property.
  * @param output Output bundle format; defaults to plain JS
  */
-export declare function metroBundle(metroConfig: ConfigT, bundleConfig: CliPlatformBundleConfig, dev: boolean, minify?: boolean, output?: typeof bundle): Promise<void>;
+export declare function metroBundle(metroConfig: ConfigT, bundleConfig: CliPlatformBundleConfig, dev: boolean, minify?: boolean, output?: typeof bundle, fs?: typeof nodefs): Promise<void>;
 //# sourceMappingURL=metro.d.ts.map

package/lib/bundle/metro.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.metroBundle = metroBundle;
 const console_1 = require("@rnx-kit/console");
 const metro_service_1 = require("@rnx-kit/metro-service");
+const nodefs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const filesystem_1 = require("../helpers/filesystem");
 const metro_config_1 = require("../helpers/metro-config");
@@ -41,7 +42,7 @@ const metro_config_1 = require("../helpers/metro-config");
  * @param minify Optionally choose whether or not the bundle is minified. When not set, minification is controlled by the `dev` property.
  * @param output Output bundle format; defaults to plain JS
  */
-async function metroBundle(metroConfig, bundleConfig, dev, minify, output = metro_service_1.bundle) {
+async function metroBundle(metroConfig, bundleConfig, dev, minify, output = metro_service_1.bundle, fs = nodefs) {
     (0, console_1.info)(`Bundling ${bundleConfig.platform}...`);
     if (!dev && bundleConfig.treeShake) {
         if (minify != null) {
@@ -63,12 +64,12 @@ async function metroBundle(metroConfig, bundleConfig, dev, minify, output = metr
         minify,
     };
     // ensure all output directories exist
-    (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.bundleOutput));
+    (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.bundleOutput), fs);
     if (metroBundleArgs.sourcemapOutput) {
-        (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.sourcemapOutput));
+        (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.sourcemapOutput), fs);
     }
     if (metroBundleArgs.assetsDest) {
-        (0, filesystem_1.ensureDir)(metroBundleArgs.assetsDest);
+        (0, filesystem_1.ensureDir)(metroBundleArgs.assetsDest, fs);
     }
     // create the bundle
     await output(metroBundleArgs, metroConfig);

package/lib/copy-assets.d.ts

@@ -2,7 +2,7 @@ import type { Config as CLIConfig } from "@react-native-community/cli-types";
 import type { PackageManifest } from "@rnx-kit/tools-node/package";
 import type { AllPlatforms } from "@rnx-kit/tools-react-native";
 import { parsePlatform } from "@rnx-kit/tools-react-native";
-import * as nodefs from "fs";
+import * as nodefs from "node:fs";
 export type AndroidArchive = {
     targetName?: string;
     version?: string;
@@ -42,10 +42,10 @@ export type Context = {
 export type AssetsConfig = {
     getAssets?: (context: Context) => Promise<NativeAssets>;
 };
-export declare function versionOf(pkgName: string): string;
-export declare function assembleAarBundle(context: Context, packageName: string, { aar }: NativeAssets): Promise<void>;
+export declare function versionOf(pkgName: string, fs?: typeof nodefs): string;
+export declare function assembleAarBundle(context: Context, packageName: string, { aar }: NativeAssets, fs?: typeof nodefs): Promise<void>;
 export declare function copyAssets({ options: { assetsDest, xcassetsDest } }: Context, packageName: string, { assets, strings, xcassets }: NativeAssets, fs?: typeof nodefs): Promise<void>;
-export declare function gatherConfigs({ projectRoot, manifest, }: Context): Promise<Record<string, AssetsConfig | null> | undefined>;
+export declare function gatherConfigs({ projectRoot, manifest }: Context, fs?: typeof nodefs): Promise<Record<string, AssetsConfig | null> | undefined>;
 /**
  * Copies additional assets not picked by bundlers into desired directory.
  *
@@ -99,7 +99,7 @@ export declare function gatherConfigs({ projectRoot, manifest, }: Context): Prom
  *
  * @param options Options dictate what gets copied where
  */
-export declare function copyProjectAssets(options: Options, { root: projectRoot, reactNativePath }: CLIConfig): Promise<void>;
+export declare function copyProjectAssets(options: Options, { root: projectRoot, reactNativePath }: CLIConfig, fs?: typeof nodefs): Promise<void>;
 export declare const rnxCopyAssetsCommand: {
     name: string;
     description: string;

package/lib/copy-assets.js

@@ -34,11 +34,10 @@ const properties_1 = require("@rnx-kit/tools-language/properties");
 const package_1 = require("@rnx-kit/tools-node/package");
 const path_1 = require("@rnx-kit/tools-node/path");
 const tools_react_native_1 = require("@rnx-kit/tools-react-native");
-const child_process_1 = require("child_process");
-const fs = __importStar(require("fs"));
-const nodefs = __importStar(require("fs"));
-const os = __importStar(require("os"));
-const path = __importStar(require("path"));
+const node_child_process_1 = require("node:child_process");
+const nodefs = __importStar(require("node:fs"));
+const os = __importStar(require("node:os"));
+const path = __importStar(require("node:path"));
 const filesystem_1 = require("./helpers/filesystem");
 const defaultAndroidConfig = {
     androidPluginVersion: "7.2.2",
@@ -49,7 +48,7 @@ const defaultAndroidConfig = {
     },
     kotlinVersion: "1.7.22",
 };
-function cloneFile(src, dest) {
+function cloneFile(src, dest, fs = nodefs) {
     return fs.promises.copyFile(src, dest, fs.constants.COPYFILE_FICLONE);
 }
 function cp_r(source, destination, fs = nodefs) {
@@ -61,7 +60,7 @@ function ensureOption(options, opt, flag = opt) {
         process.exit(1);
     }
 }
-function findGradleProject(projectRoot) {
+function findGradleProject(projectRoot, fs = nodefs) {
     if (fs.existsSync(path.join(projectRoot, "android", "build.gradle"))) {
         return path.join(projectRoot, "android");
     }
@@ -76,21 +75,21 @@ function gradleTargetName(packageName) {
 function isAssetsConfig(config) {
     return typeof config === "object" && config !== null && "getAssets" in config;
 }
-function versionOf(pkgName) {
-    const packageDir = (0, package_1.findPackageDependencyDir)(pkgName);
+function versionOf(pkgName, fs = nodefs) {
+    const packageDir = (0, package_1.findPackageDependencyDir)(pkgName, undefined, fs);
     if (!packageDir) {
         throw new Error(`Could not find module '${pkgName}'`);
     }
-    const { version } = (0, package_1.readPackage)(packageDir);
+    const { version } = (0, package_1.readPackage)(packageDir, fs);
     return version;
 }
-function getAndroidPaths(context, packageName, { targetName, version, output }) {
-    const projectRoot = (0, package_1.findPackageDependencyDir)(packageName);
+function getAndroidPaths(context, packageName, { targetName, version, output }, fs = nodefs) {
+    const projectRoot = (0, package_1.findPackageDependencyDir)(packageName, undefined, fs);
     if (!projectRoot) {
         throw new Error(`Could not find module '${packageName}'`);
     }
     const gradleFriendlyName = targetName || gradleTargetName(packageName);
-    const aarVersion = version || versionOf(packageName);
+    const aarVersion = version || versionOf(packageName, fs);
     switch (packageName) {
         case "hermes-engine":
             return {
@@ -98,7 +97,7 @@ function getAndroidPaths(context, packageName, { targetName, version, output })
                 version: aarVersion,
                 projectRoot,
                 output: path.join(projectRoot, "android", "hermes-release.aar"),
-                destination: path.join(context.options.assetsDest, "aar", `hermes-release-${versionOf(packageName)}.aar`),
+                destination: path.join(context.options.assetsDest, "aar", `hermes-release-${versionOf(packageName, fs)}.aar`),
             };
         case "react-native":
             return {
@@ -109,7 +108,7 @@ function getAndroidPaths(context, packageName, { targetName, version, output })
                 destination: path.join(context.options.assetsDest, "aar", "react-native"),
             };
         default: {
-            const androidProject = findGradleProject(projectRoot);
+            const androidProject = findGradleProject(projectRoot, fs);
             return {
                 targetName: gradleFriendlyName,
                 version: aarVersion,
@@ -124,22 +123,22 @@ function getAndroidPaths(context, packageName, { targetName, version, output })
     }
 }
 function run(command, args, options) {
-    const { status } = (0, child_process_1.spawnSync)(command, args, options);
+    const { status } = (0, node_child_process_1.spawnSync)(command, args, options);
     if (status !== 0) {
         process.exit(status || 1);
     }
 }
-async function assembleAarBundle(context, packageName, { aar }) {
+async function assembleAarBundle(context, packageName, { aar }, fs = nodefs) {
     if (!aar) {
         return;
     }
     const wrapper = os.platform() === "win32" ? "gradlew.bat" : "gradlew";
-    const gradlew = (0, path_1.findUp)(wrapper);
+    const gradlew = (0, path_1.findUp)(wrapper, undefined, fs);
     if (!gradlew) {
         (0, console_1.warn)(`Skipped \`${packageName}\`: cannot find \`${wrapper}\``);
         return;
     }
-    const { targetName, version, androidProject, output } = getAndroidPaths(context, packageName, aar);
+    const { targetName, version, androidProject, output } = getAndroidPaths(context, packageName, aar, fs);
     if (!androidProject || !output) {
         (0, console_1.warn)(`Skipped \`${packageName}\`: cannot find \`build.gradle\``);
         return;
@@ -147,7 +146,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
     const { env: customEnv, dependencies, android } = aar;
     const env = {
         NODE_MODULES_PATH: path.join(process.cwd(), "node_modules"),
-        REACT_NATIVE_VERSION: versionOf("react-native"),
+        REACT_NATIVE_VERSION: versionOf("react-native", fs),
         ...process.env,
         ...customEnv,
     };
@@ -160,7 +159,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
     if (fs.existsSync(settings)) {
         if (dependencies) {
             for (const [dependencyName, aar] of Object.entries(dependencies)) {
-                const { targetName, output, destination } = getAndroidPaths(context, dependencyName, aar);
+                const { targetName, output, destination } = getAndroidPaths(context, dependencyName, aar, fs);
                 if (output) {
                     if (!fs.existsSync(output)) {
                         targets.push(`:${targetName}:assembleRelease`);
@@ -232,7 +231,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
         // Run only one Gradle task at a time
         run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
     }
-    await Promise.all(targetsToCopy.map(([src, dest]) => cloneFile(src, dest)));
+    await Promise.all(targetsToCopy.map(([src, dest]) => cloneFile(src, dest, fs)));
 }
 function copyFiles(files, destination, fs = nodefs) {
     if (!Array.isArray(files) || files.length === 0) {
@@ -253,7 +252,7 @@ async function copyAssets({ options: { assetsDest, xcassetsDest } }, packageName
     }
     await Promise.all(tasks);
 }
-async function gatherConfigs({ projectRoot, manifest, }) {
+async function gatherConfigs({ projectRoot, manifest }, fs = nodefs) {
     const { dependencies, devDependencies } = manifest;
     const packages = [...(0, properties_1.keysOf)(dependencies), ...(0, properties_1.keysOf)(devDependencies)];
     if (packages.length === 0) {
@@ -342,10 +341,10 @@ async function gatherConfigs({ projectRoot, manifest, }) {
  *
  * @param options Options dictate what gets copied where
  */
-async function copyProjectAssets(options, { root: projectRoot, reactNativePath }) {
+async function copyProjectAssets(options, { root: projectRoot, reactNativePath }, fs = nodefs) {
     const manifest = (0, package_1.readPackage)(projectRoot);
     const context = { projectRoot, manifest, options, reactNativePath };
-    const assetConfigs = await gatherConfigs(context);
+    const assetConfigs = await gatherConfigs(context, fs);
     if (!assetConfigs) {
         return;
     }
@@ -362,22 +361,22 @@ async function copyProjectAssets(options, { root: projectRoot, reactNativePath }
         const assets = await getAssets(context);
         if (options.bundleAar && assets.aar) {
             (0, console_1.info)(`Assembling "${packageName}"`);
-            await assembleAarBundle(context, packageName, assets);
+            await assembleAarBundle(context, packageName, assets, fs);
         }
         else {
             (0, console_1.info)(`Copying assets for "${packageName}"`);
-            await copyAssets(context, packageName, assets);
+            await copyAssets(context, packageName, assets, fs);
         }
     }
     if (options.bundleAar) {
         const dummyAar = { targetName: "dummy" };
         const copyTasks = [];
         for (const dependencyName of ["hermes-engine", "react-native"]) {
-            const { output, destination } = getAndroidPaths(context, dependencyName, dummyAar);
+            const { output, destination } = getAndroidPaths(context, dependencyName, dummyAar, fs);
             if (output &&
                 (!fs.existsSync(destination) || fs.statSync(destination).isDirectory())) {
                 (0, console_1.info)(`Copying Android Archive of "${dependencyName}"`);
-                copyTasks.push(cloneFile(output, destination));
+                copyTasks.push(cloneFile(output, destination, fs));
             }
         }
         await Promise.all(copyTasks);
@@ -389,7 +388,7 @@ exports.rnxCopyAssetsCommand = {
     func: (_argv, config, options) => {
         ensureOption(options, "platform");
         ensureOption(options, "assetsDest", "assets-dest");
-        return copyProjectAssets(options, config);
+        return copyProjectAssets(options, config, nodefs);
     },
     options: [
         {

package/lib/helpers/filesystem.d.ts

@@ -1,3 +1,3 @@
-import * as nodefs from "fs";
+import * as nodefs from "node:fs";
 export declare function ensureDir(p: string, fs?: typeof nodefs): void;
 //# sourceMappingURL=filesystem.d.ts.map

package/lib/helpers/filesystem.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureDir = ensureDir;
-const nodefs = __importStar(require("fs")); // Cannot use `node:fs` because of Jest mocks
+const nodefs = __importStar(require("node:fs"));
 function ensureDir(p, fs = nodefs) {
     fs.mkdirSync(p, { recursive: true, mode: 0o755 });
 }

package/lib/index.js

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rnxWriteThirdPartyNoticesCommand = exports.rnxWriteThirdPartyNotices = exports.rnxTestCommand = exports.rnxTest = exports.rnxStartCommand = exports.rnxStart = exports.rnxRunCommand = exports.rnxRun = exports.rnxRamBundleCommand = exports.rnxRamBundle = exports.rnxCopyAssetsCommand = exports.copyProjectAssets = exports.rnxCleanCommand = exports.rnxClean = exports.rnxBundleCommand = exports.rnxBundle = exports.rnxBuildCommand = exports.rnxBuild = exports.rnxAlignDepsCommand = exports.rnxAlignDeps = exports.reactNativeConfig = void 0;
 const align_deps_1 = require("./align-deps");
+const build_1 = require("./build");
 const bundle_1 = require("./bundle");
 const clean_1 = require("./clean");
 const copy_assets_1 = require("./copy-assets");
 const ram_bundle_1 = require("./ram-bundle");
+const run_1 = require("./run");
 const start_1 = require("./start");
 const test_1 = require("./test");
 const write_third_party_notices_1 = require("./write-third-party-notices");
@@ -14,6 +16,8 @@ exports.reactNativeConfig = {
         bundle_1.rnxBundleCommand,
         ram_bundle_1.rnxRamBundleCommand,
         start_1.rnxStartCommand,
+        build_1.rnxBuildCommand,
+        run_1.rnxRunCommand,
         copy_assets_1.rnxCopyAssetsCommand,
         align_deps_1.rnxAlignDepsCommand,
         test_1.rnxTestCommand,
@@ -24,9 +28,9 @@ exports.reactNativeConfig = {
 var align_deps_2 = require("./align-deps");
 Object.defineProperty(exports, "rnxAlignDeps", { enumerable: true, get: function () { return align_deps_2.rnxAlignDeps; } });
 Object.defineProperty(exports, "rnxAlignDepsCommand", { enumerable: true, get: function () { return align_deps_2.rnxAlignDepsCommand; } });
-var build_1 = require("./build");
-Object.defineProperty(exports, "rnxBuild", { enumerable: true, get: function () { return build_1.rnxBuild; } });
-Object.defineProperty(exports, "rnxBuildCommand", { enumerable: true, get: function () { return build_1.rnxBuildCommand; } });
+var build_2 = require("./build");
+Object.defineProperty(exports, "rnxBuild", { enumerable: true, get: function () { return build_2.rnxBuild; } });
+Object.defineProperty(exports, "rnxBuildCommand", { enumerable: true, get: function () { return build_2.rnxBuildCommand; } });
 var bundle_2 = require("./bundle");
 Object.defineProperty(exports, "rnxBundle", { enumerable: true, get: function () { return bundle_2.rnxBundle; } });
 Object.defineProperty(exports, "rnxBundleCommand", { enumerable: true, get: function () { return bundle_2.rnxBundleCommand; } });
@@ -39,9 +43,9 @@ Object.defineProperty(exports, "rnxCopyAssetsCommand", { enumerable: true, get:
 var ram_bundle_2 = require("./ram-bundle");
 Object.defineProperty(exports, "rnxRamBundle", { enumerable: true, get: function () { return ram_bundle_2.rnxRamBundle; } });
 Object.defineProperty(exports, "rnxRamBundleCommand", { enumerable: true, get: function () { return ram_bundle_2.rnxRamBundleCommand; } });
-var run_1 = require("./run");
-Object.defineProperty(exports, "rnxRun", { enumerable: true, get: function () { return run_1.rnxRun; } });
-Object.defineProperty(exports, "rnxRunCommand", { enumerable: true, get: function () { return run_1.rnxRunCommand; } });
+var run_2 = require("./run");
+Object.defineProperty(exports, "rnxRun", { enumerable: true, get: function () { return run_2.rnxRun; } });
+Object.defineProperty(exports, "rnxRunCommand", { enumerable: true, get: function () { return run_2.rnxRunCommand; } });
 var start_2 = require("./start");
 Object.defineProperty(exports, "rnxStart", { enumerable: true, get: function () { return start_2.rnxStart; } });
 Object.defineProperty(exports, "rnxStartCommand", { enumerable: true, get: function () { return start_2.rnxStartCommand; } });

package/lib/run/android.d.ts

@@ -0,0 +1,4 @@
+import type { Config } from "@react-native-community/cli-types";
+import type { AndroidInputParams } from "../build/types";
+export declare function runAndroid(config: Config, buildParams: AndroidInputParams): Promise<void>;
+//# sourceMappingURL=android.d.ts.map

package/lib/run/android.js

@@ -0,0 +1,80 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runAndroid = runAndroid;
+const path = __importStar(require("node:path"));
+const ora_1 = __importDefault(require("ora"));
+const android_1 = require("../build/android");
+async function runAndroid(config, buildParams) {
+    const logger = (0, ora_1.default)();
+    const projectDir = await (0, android_1.buildAndroid)(config, buildParams, logger);
+    if (typeof projectDir !== "string") {
+        return;
+    }
+    logger.start("Preparing to launch app");
+    const { findOutputFile, getPackageName, install, selectDevice, start } = await import("@rnx-kit/tools-android");
+    const { configuration = "Debug" } = buildParams;
+    const apks = findOutputFile(projectDir, configuration);
+    if (apks.length === 0) {
+        logger.fail("Failed to find the APK that was just built");
+        process.exitCode = 1;
+        return;
+    }
+    if (apks.length > 1) {
+        const currentStatus = logger.text;
+        const choices = apks.map((p) => path.basename(p)).join(", ");
+        logger.info(`Multiple APKs were found; picking the first one: ${choices}`);
+        logger.info("If this is wrong, remove the others and try again");
+        logger.start(currentStatus);
+    }
+    const apk = apks[0];
+    const info = getPackageName(apk);
+    if (info instanceof Error) {
+        logger.fail(info.message);
+        process.exitCode = 1;
+        return;
+    }
+    const device = await selectDevice(buildParams.device, logger);
+    if (!device) {
+        logger.fail("Failed to launch app: Could not find an appropriate device");
+        process.exitCode = 1;
+        return;
+    }
+    logger.start(`Installing ${apk}`);
+    const { packageName, activityName } = info;
+    const error = await install(device, apk, packageName);
+    if (error) {
+        logger.fail(error.message);
+        process.exitCode = 1;
+        return;
+    }
+    logger.text = `Starting ${packageName}`;
+    await start(device, packageName, activityName);
+    logger.succeed(`Started ${packageName}`);
+}
+//# sourceMappingURL=android.js.map

package/lib/run/ios.d.ts

@@ -1,4 +1,4 @@
 import type { Config } from "@react-native-community/cli-types";
-import type { InputParams } from "../build/apple";
+import type { InputParams } from "../build/types";
 export declare function runIOS(config: Config, buildParams: InputParams): Promise<void>;
 //# sourceMappingURL=ios.d.ts.map

package/lib/run/ios.js

@@ -40,7 +40,7 @@ async function runIOS(config, buildParams) {
     if (!result || typeof result !== "object") {
         return;
     }
-    logger.start("Preparing to launch app...");
+    logger.start("Preparing to launch app");
     const { getBuildSettings, getDevicePlatformIdentifier, install, launch, selectDevice, } = await import("@rnx-kit/tools-apple");
     const { destination = "simulator", device: deviceName } = buildParams;
     const deviceOrPlatformIdentifier = deviceName ?? getDevicePlatformIdentifier(buildParams);
@@ -60,7 +60,7 @@ async function runIOS(config, buildParams) {
     }
     const { EXECUTABLE_FOLDER_PATH, FULL_PRODUCT_NAME, TARGET_BUILD_DIR } = settings.buildSettings;
     const app = path.join(TARGET_BUILD_DIR, EXECUTABLE_FOLDER_PATH);
-    logger.start(`Installing '${FULL_PRODUCT_NAME}' on ${device.name}...`);
+    logger.start(`Installing '${FULL_PRODUCT_NAME}' on ${device.name}`);
     const installError = await install(device, app);
     if (installError) {
         logger.fail(installError.message);

package/lib/run/macos.d.ts

@@ -1,4 +1,4 @@
 import type { Config } from "@react-native-community/cli-types";
-import type { InputParams } from "../build/apple";
-export declare function runMacOS(config: Config, buildParams: InputParams): Promise<void>;
+import type { AppleInputParams } from "../build/types";
+export declare function runMacOS(config: Config, buildParams: AppleInputParams): Promise<void>;
 //# sourceMappingURL=macos.d.ts.map

package/lib/run/macos.js

@@ -37,7 +37,7 @@ async function runMacOS(config, buildParams) {
         return;
     }
     const { getBuildSettings, open } = await import("@rnx-kit/tools-apple");
-    logger.start("Launching app...");
+    logger.start("Launching app");
     const settings = await getBuildSettings(result.xcworkspace, result.args);
     if (!settings) {
         logger.fail("Failed to launch app: Could not get build settings");
@@ -46,7 +46,7 @@ async function runMacOS(config, buildParams) {
     }
     const { FULL_PRODUCT_NAME, TARGET_BUILD_DIR } = settings.buildSettings;
     const appPath = path.join(TARGET_BUILD_DIR, FULL_PRODUCT_NAME);
-    logger.text = `Launching '${FULL_PRODUCT_NAME}'...`;
+    logger.text = `Launching '${FULL_PRODUCT_NAME}'`;
     const { stderr, status } = await open(appPath);
     if (status !== 0) {
         logger.fail(`Failed to launch app: ${stderr}`);

package/lib/run.d.ts

@@ -1,5 +1,5 @@
 import type { Config } from "@react-native-community/cli-types";
-import type { InputParams } from "./build/apple";
+import type { InputParams } from "./build/types";
 export declare function rnxRun(_argv: string[], config: Config, buildParams: InputParams): Promise<void>;
 export declare const rnxRunCommand: {
     name: string;
@@ -19,12 +19,12 @@ export declare const rnxRunCommand: {
         name: string;
         description: string;
         default: string;
-        parse: (configuration: string) => import("./build/apple").BuildConfiguration;
+        parse: (configuration: string) => import("./build/types").BuildConfiguration;
     } | {
         name: string;
         description: string;
         default: string;
-        parse: (destination: string) => import("./build/apple").DeviceType;
+        parse: (destination: string) => import("./build/types").DeviceType;
     })[];
 };
 //# sourceMappingURL=run.d.ts.map

package/lib/run.js

@@ -3,10 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rnxRunCommand = void 0;
 exports.rnxRun = rnxRun;
 const build_1 = require("./build");
+const android_1 = require("./run/android");
 const ios_1 = require("./run/ios");
 const macos_1 = require("./run/macos");
 function rnxRun(_argv, config, buildParams) {
     switch (buildParams.platform) {
+        case "android":
+            return (0, android_1.runAndroid)(config, buildParams);
         case "ios":
         case "visionos":
             return (0, ios_1.runIOS)(config, buildParams);
@@ -21,7 +24,7 @@ exports.rnxRunCommand = {
     options: [
         ...build_1.rnxBuildCommand.options,
         {
-            name: "--device <string>",
+            name: "-d, --device <string>",
             description: "The name of the device to launch the app in",
         },
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "description": "Command-line interface for working with kit packages in your repo",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli#readme",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "test": "rnx-kit-scripts test"
   },
   "dependencies": {
-    "@rnx-kit/align-deps": "^2.5.2",
+    "@rnx-kit/align-deps": "^2.5.4",
     "@rnx-kit/config": "^0.6.6",
     "@rnx-kit/console": "^1.1.0",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.1",
@@ -50,6 +50,7 @@
     "@rnx-kit/metro-serializer-esbuild": "^0.1.38",
     "@rnx-kit/metro-service": "^3.1.6",
     "@rnx-kit/third-party-notices": "^1.3.4",
+    "@rnx-kit/tools-android": "^0.1.1",
     "@rnx-kit/tools-apple": "^0.1.2",
     "@rnx-kit/tools-language": "^2.0.0",
     "@rnx-kit/tools-node": "^2.1.1",