@rnx-kit/cli 0.17.5 → 0.17.7

package/lib/build/android.js

@@ -4,13 +4,15 @@ 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"));
 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;
+        logger.fail("No Android project was found");
         return Promise.resolve(null);
     }
     return import("@rnx-kit/tools-android").then(({ assemble }) => {

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/index.d.ts

@@ -2,7 +2,20 @@ import type { Command } from "@react-native-community/cli-types";
 export declare const reactNativeConfig: {
     commands: Command<false>[];
 };
-export { rnxAlignDeps, rnxAlignDepsCommand } from "./align-deps";
+export declare const rnxAlignDeps: (_argv: string[], _config: import("@react-native-community/cli-types").Config, args: {
+    [x: string]: string | number | boolean | undefined;
+}) => void;
+export declare const rnxAlignDepsCommand: {
+    name: string;
+    description: string;
+    func: (_argv: string[], _config: import("@react-native-community/cli-types").Config, args: {
+        [x: string]: string | number | boolean | undefined;
+    }) => void;
+    readonly options: {
+        name: string;
+        description: string;
+    }[];
+};
 export { rnxBuild, rnxBuildCommand } from "./build";
 export { rnxBundle, rnxBundleCommand } from "./bundle";
 export { rnxClean, rnxCleanCommand } from "./clean";

package/lib/index.js

@@ -1,7 +1,7 @@
 "use strict";
 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 align_deps_1 = require("@rnx-kit/align-deps");
 const build_1 = require("./build");
 const bundle_1 = require("./bundle");
 const clean_1 = require("./clean");
@@ -19,15 +19,15 @@ exports.reactNativeConfig = {
         build_1.rnxBuildCommand,
         run_1.rnxRunCommand,
         copy_assets_1.rnxCopyAssetsCommand,
-        align_deps_1.rnxAlignDepsCommand,
+        align_deps_1.alignDepsCommand,
         test_1.rnxTestCommand,
         write_third_party_notices_1.rnxWriteThirdPartyNoticesCommand,
         clean_1.rnxCleanCommand,
     ],
 };
-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; } });
+// @rnx-kit/align-deps
+exports.rnxAlignDeps = align_deps_1.alignDepsCommand.func;
+exports.rnxAlignDepsCommand = align_deps_1.alignDepsCommand;
 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; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.17.5",
+  "version": "0.17.7",
   "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.4",
+    "@rnx-kit/align-deps": "^2.5.5",
     "@rnx-kit/config": "^0.6.6",
     "@rnx-kit/console": "^1.1.0",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.1",
@@ -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"

package/lib/align-deps.d.ts

@@ -1,14 +0,0 @@
-import type { Config as CLIConfig } from "@react-native-community/cli-types";
-type CLIArgs = Record<string, string | number | boolean | undefined>;
-export declare function rnxAlignDeps(_argv: string[], _config: CLIConfig, args: CLIArgs): void;
-export declare const rnxAlignDepsCommand: {
-    name: string;
-    description: string;
-    func: typeof rnxAlignDeps;
-    options: {
-        name: string;
-        description: string;
-    }[];
-};
-export {};
-//# sourceMappingURL=align-deps.d.ts.map

package/lib/align-deps.js

@@ -1,76 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rnxAlignDepsCommand = void 0;
-exports.rnxAlignDeps = rnxAlignDeps;
-const align_deps_1 = require("@rnx-kit/align-deps");
-const properties_1 = require("@rnx-kit/tools-language/properties");
-const optionsMap = {
-    "exclude-packages": "excludePackages",
-    init: "init",
-    presets: "presets",
-    requirements: "requirements",
-    "set-version": "setVersion",
-};
-function rnxAlignDeps(_argv, _config, args) {
-    (0, align_deps_1.cli)({
-        ...(0, properties_1.pickValues)(args, Object.values(optionsMap), Object.keys(optionsMap)),
-        "diff-mode": args.diffMode?.toString(),
-        loose: Boolean(args.loose),
-        "migrate-config": Boolean(args.migrateConfig),
-        "no-unmanaged": Boolean(args.noUnmanaged),
-        verbose: Boolean(args.verbose),
-        write: Boolean(args.write),
-    });
-}
-exports.rnxAlignDepsCommand = {
-    name: "rnx-align-deps",
-    description: "Manage dependencies within a repository and across many repositories",
-    func: rnxAlignDeps,
-    options: [
-        {
-            name: `--diff-mode <${align_deps_1.cliOptions["diff-mode"].choices.join("|")}>`,
-            description: align_deps_1.cliOptions["diff-mode"].description,
-        },
-        {
-            name: "--exclude-packages <packages>",
-            description: align_deps_1.cliOptions["exclude-packages"].description,
-        },
-        {
-            name: `--init <${align_deps_1.cliOptions.init.choices?.join("|")}>`,
-            description: align_deps_1.cliOptions.init.description,
-        },
-        {
-            name: "--loose",
-            description: align_deps_1.cliOptions.loose.description,
-        },
-        {
-            name: "--migrate-config",
-            description: align_deps_1.cliOptions["migrate-config"].description,
-        },
-        {
-            name: "--no-unmanaged",
-            description: align_deps_1.cliOptions["no-unmanaged"].description,
-        },
-        {
-            name: "--presets <presets>",
-            description: align_deps_1.cliOptions.presets.description,
-        },
-        {
-            name: "--requirements <requirements>",
-            description: align_deps_1.cliOptions.requirements.description,
-        },
-        {
-            name: "--set-version [versions]",
-            description: align_deps_1.cliOptions["set-version"].description,
-        },
-        {
-            name: "--verbose",
-            description: align_deps_1.cliOptions.verbose.description,
-        },
-        {
-            name: "--write",
-            description: align_deps_1.cliOptions.write.description,
-        },
-    ],
-};
-//# sourceMappingURL=align-deps.js.map