@rnx-kit/cli 0.17.4 → 0.17.6

package/lib/build/android.d.ts

@@ -1,5 +1,6 @@
 import type { Config } from "@react-native-community/cli-types";
 import ora from "ora";
 import type { AndroidBuildParams } from "./types";
-export declare function buildAndroid(config: Config, buildParams: AndroidBuildParams, logger?: ora.Ora): Promise<string | number | null>;
+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

@@ -4,32 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildAndroid = buildAndroid;
+const cache_1 = require("@rnx-kit/tools-react-native/cache");
 const ora_1 = __importDefault(require("ora"));
-async function buildAndroid(config, buildParams, logger = (0, ora_1.default)()) {
+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");
+        (0, cache_1.invalidateState)();
         process.exitCode = 1;
-        return null;
+        logger.fail("No Android project was found");
+        return Promise.resolve(null);
     }
     return import("@rnx-kit/tools-android").then(({ assemble }) => {
         return new Promise((resolve) => {
-            logger.start("Building");
-            const errors = [];
             const gradle = assemble(sourceDir, buildParams);
-            gradle.stdout.on("data", () => (logger.text += "."));
-            gradle.stderr.on("data", (data) => errors.push(data));
-            gradle.on("close", (code) => {
-                if (code === 0) {
-                    logger.succeed("Build succeeded");
-                    resolve(sourceDir);
-                }
-                else {
-                    logger.fail(Buffer.concat(errors).toString());
-                    process.exitCode = code ?? 1;
-                    resolve(code);
-                }
-            });
+            (0, watcher_1.watch)(gradle, logger, () => resolve(sourceDir), resolve);
         });
     });
 }

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.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildIOS = buildIOS;
+const cache_1 = require("@rnx-kit/tools-react-native/cache");
 const path = __importStar(require("node:path"));
 const ora_1 = __importDefault(require("ora"));
 const apple_1 = require("./apple");
@@ -34,15 +35,17 @@ function buildIOS(config, buildParams, logger = (0, ora_1.default)()) {
     const { platform } = buildParams;
     const { sourceDir, xcodeProject } = config.project[platform] ?? {};
     if (!sourceDir || !xcodeProject) {
+        (0, cache_1.invalidateState)();
+        process.exitCode = 1;
         const root = platform.substring(0, platform.length - 2);
         logger.fail(`No ${root}OS project was found; did you forget to run 'pod install'?`);
-        process.exitCode = 1;
         return Promise.resolve(1);
     }
     const { name, path: projectDir } = xcodeProject;
     if (!name?.endsWith(".xcworkspace")) {
-        logger.fail("No Xcode workspaces were found; did you forget to run `pod install`?");
+        (0, cache_1.invalidateState)();
         process.exitCode = 1;
+        logger.fail("No Xcode workspaces were found; did you forget to run `pod install`?");
         return Promise.resolve(1);
     }
     const xcworkspace = projectDir

package/lib/build/macos.js

@@ -27,6 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildMacOS = buildMacOS;
+const cache_1 = require("@rnx-kit/tools-react-native/cache");
 const fs = __importStar(require("node:fs"));
 const path = __importStar(require("node:path"));
 const ora_1 = __importDefault(require("ora"));
@@ -43,8 +44,9 @@ function buildMacOS(_config, { workspace, ...buildParams }, logger = (0, ora_1.d
     const sourceDir = "macos";
     const workspaces = findXcodeWorkspaces(sourceDir);
     if (workspaces.length === 0) {
-        logger.fail("No Xcode workspaces were found; specify an Xcode workspace with `--workspace`");
+        (0, cache_1.invalidateState)();
         process.exitCode = 1;
+        logger.fail("No Xcode workspaces were found; specify an Xcode workspace with `--workspace`");
         return Promise.resolve(1);
     }
     if (workspaces.length > 1) {

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

@@ -3,7 +3,7 @@ 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<string | number | null> | 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

@@ -53,7 +53,7 @@ exports.rnxBuildCommand = {
     func: rnxBuild,
     options: [
         {
-            name: "--platform <string>",
+            name: "-p, --platform <string>",
             description: "Target platform",
             parse: asSupportedPlatform,
         },

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.js

@@ -24,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.4",
+  "version": "0.17.6",
   "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",
@@ -54,7 +54,7 @@
     "@rnx-kit/tools-apple": "^0.1.2",
     "@rnx-kit/tools-language": "^2.0.0",
     "@rnx-kit/tools-node": "^2.1.1",
-    "@rnx-kit/tools-react-native": "^1.4.1",
+    "@rnx-kit/tools-react-native": "^1.4.2",
     "commander": "^11.1.0",
     "ora": "^5.4.1",
     "qrcode": "^1.5.0"