@rnx-kit/cli 0.18.1 → 0.18.3

package/lib/bin/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const RNX_FAST_PATH: unique symbol;
+export declare const RNX_PREFIX = "rnx-";
+//# sourceMappingURL=constants.d.ts.map

package/lib/bin/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RNX_PREFIX = exports.RNX_FAST_PATH = void 0;
+exports.RNX_FAST_PATH = Symbol.for("rnxFastPath");
+exports.RNX_PREFIX = "rnx-";
+//# sourceMappingURL=constants.js.map

package/lib/bin/context.d.ts

@@ -1,25 +1,11 @@
 import type { Command as BaseCommand, Config as BaseConfig } from "@react-native-community/cli-types";
+import { RNX_FAST_PATH } from "./constants";
 type Command = BaseCommand<false> | BaseCommand<true>;
 type Config = BaseConfig & {
-    __rnxFastPath?: true;
+    [RNX_FAST_PATH]?: true;
     commands: Command[];
 };
-export declare function getCoreCommands(): {
-    name: string;
-    description?: string;
-    detached?: false | undefined;
-    examples?: Array<{
-        desc: string;
-        cmd: string;
-    }>;
-    pkg?: {
-        name: string;
-        version: string;
-    };
-    func: import("@react-native-community/cli-types").CommandFunction<Object>;
-    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 loadContextForCommand(userCommand: string, root?: string): Config;
+export declare function loadContextForCommand(userCommand: string, root?: string): Promise<Config>;
 export {};
 //# sourceMappingURL=context.d.ts.map

package/lib/bin/context.js

@@ -1,13 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCoreCommands = getCoreCommands;
 exports.uniquify = uniquify;
 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");
 const index_1 = require("../index");
-const RNX_PREFIX = "rnx-";
+const constants_1 = require("./constants");
+function canUseFastPath(userCommand) {
+    const cmd = constants_1.RNX_PREFIX + userCommand;
+    for (const command of index_1.reactNativeConfig.commands) {
+        if (command.name === cmd) {
+            return !(constants_1.RNX_FAST_PATH in command) || command[constants_1.RNX_FAST_PATH] !== false;
+        }
+    }
+    return false;
+}
 function findReactNativePath(root, resolveSymlinks = false) {
     const dir = (0, package_1.findPackageDependencyDir)("react-native", {
         startDir: root,
@@ -18,19 +26,12 @@ function findReactNativePath(root, resolveSymlinks = false) {
     }
     return dir;
 }
-function getCoreCommands() {
-    const start = RNX_PREFIX.length;
-    return index_1.reactNativeConfig.commands.map((command) => ({
-        ...command,
-        name: command.name.substring(start),
-    }));
-}
 function uniquify(commands) {
     const uniqueCommands = {};
     for (const command of commands) {
         const { name } = command;
-        if (name.startsWith(RNX_PREFIX)) {
-            command.name = name.substring(RNX_PREFIX.length);
+        if (name.startsWith(constants_1.RNX_PREFIX)) {
+            command.name = name.substring(constants_1.RNX_PREFIX.length);
             uniqueCommands[command.name] = command;
         }
         else if (!uniqueCommands[name]) {
@@ -39,16 +40,23 @@ function uniquify(commands) {
     }
     return Object.values(uniqueCommands);
 }
-function loadContextForCommand(userCommand, root = process.cwd()) {
+async function loadContextWithCLI(root) {
+    const rncli = (0, context_1.resolveCommunityCLI)(root);
+    const { loadConfig, loadConfigAsync } = require(rncli);
+    if (!loadConfigAsync) {
+        const options = loadConfig.length === 1 ? { projectRoot: root } : root;
+        return loadConfig(options);
+    }
+    return await loadConfigAsync({ projectRoot: root });
+}
+async 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();
-    const useFastPath = coreCommands.some(({ name }) => name === userCommand);
-    if (useFastPath) {
+    if (canUseFastPath(userCommand)) {
         let reactNativePath;
         let reactNativeVersion;
         return {
-            __rnxFastPath: true,
+            [constants_1.RNX_FAST_PATH]: true,
             root,
             get reactNativePath() {
                 if (!reactNativePath) {
@@ -68,7 +76,13 @@ function loadContextForCommand(userCommand, root = process.cwd()) {
                 throw new Error("Unexpected access to `dependencies`");
             },
             assets: [],
-            commands: coreCommands,
+            get commands() {
+                const start = constants_1.RNX_PREFIX.length;
+                return index_1.reactNativeConfig.commands.map((command) => ({
+                    ...command,
+                    name: command.name.substring(start),
+                }));
+            },
             get healthChecks() {
                 throw new Error("Unexpected access to `healthChecks`");
             },
@@ -76,16 +90,11 @@ function loadContextForCommand(userCommand, root = process.cwd()) {
                 throw new Error("Unexpected access to `platforms`");
             },
             get project() {
-                // Used by the build command
-                return (0, context_1.loadContext)(root).project;
+                throw new Error("Unexpected access to `project`");
             },
         };
     }
-    const rncli = (0, context_1.resolveCommunityCLI)(root);
-    const { loadConfig } = require(rncli);
-    const config = loadConfig.length === 1
-        ? loadConfig({ projectRoot: root })
-        : loadConfig(root);
+    const config = await loadContextWithCLI(root);
     // We will always load from disk because functions cannot be serialized.
     // However, we should refresh the cache if needed.
     const state = (0, cache_1.getCurrentState)(root);

package/lib/bin/externalCommands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findExternalCommands = findExternalCommands;
 const context_1 = require("@rnx-kit/tools-react-native/context");
+const constants_1 = require("./constants");
 function tryImport(module, fromDir) {
     try {
         const p = require.resolve(module, { paths: [fromDir] });
@@ -12,7 +13,7 @@ function tryImport(module, fromDir) {
     }
 }
 function findExternalCommands(config) {
-    if ("__rnxFastPath" in config) {
+    if (constants_1.RNX_FAST_PATH in config) {
         // Fast path means we don't need to do anything here
         return [];
     }

package/lib/bin/rnx-cli.d.ts

@@ -1,2 +1,2 @@
-export declare function main(): void;
+export declare function main(): Promise<void>;
 //# sourceMappingURL=rnx-cli.d.ts.map

package/lib/bin/rnx-cli.js

@@ -28,9 +28,9 @@ const commander_1 = require("commander");
 const path = __importStar(require("node:path"));
 const context_1 = require("./context");
 const externalCommands_1 = require("./externalCommands");
-function main() {
+async function main() {
     const [, , userCommand] = process.argv;
-    const context = (0, context_1.loadContextForCommand)(userCommand);
+    const context = await (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/apple.js

@@ -3,10 +3,17 @@ 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 import("@rnx-kit/tools-apple").then(({ checkPodsManifestLock, xcodebuild }) => {
+        if (!checkPodsManifestLock(xcworkspace)) {
+            logger.fail("CocoaPods sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.");
+            return Promise.resolve(1);
+        }
         const log = (message) => logger.info(message);
         const build = xcodebuild(xcworkspace, buildParams, log);
-        return (0, watcher_1.watch)(build, logger, () => ({ xcworkspace, args: build.spawnargs }));
+        return (0, watcher_1.watch)(build, logger, () => ({
+            xcworkspace,
+            args: build.spawnargs,
+        }));
     });
 }
 //# sourceMappingURL=apple.js.map

package/lib/build/ccache.d.ts

@@ -0,0 +1,3 @@
+export declare function setCcacheDir(dir: string): string | undefined;
+export declare function setCcacheHome(dir: string): string | undefined;
+//# sourceMappingURL=ccache.d.ts.map

package/lib/build/ccache.js

@@ -0,0 +1,47 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setCcacheDir = setCcacheDir;
+exports.setCcacheHome = setCcacheHome;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
+function setCcacheDir(dir) {
+    if (!fs.existsSync(dir)) {
+        return undefined;
+    }
+    process.env["CCACHE_DIR"] = dir;
+    return dir;
+}
+function setCcacheHome(dir) {
+    if (!fs.existsSync(dir)) {
+        return undefined;
+    }
+    process.env["CC"] = path.join(dir, "libexec", "clang");
+    process.env["CXX"] = path.join(dir, "libexec", "clang++");
+    process.env["CMAKE_C_COMPILER_LAUNCHER"] = path.join(dir, "bin", "ccache");
+    process.env["CMAKE_CXX_COMPILER_LAUNCHER"] = path.join(dir, "bin", "ccache");
+    return dir;
+}
+//# sourceMappingURL=ccache.js.map

package/lib/build/watcher.js

@@ -19,7 +19,7 @@ function watch(subproc, logger, onSuccess) {
                 resolve(onSuccess());
             }
             else {
-                logger.fail(Buffer.concat(errors).toString());
+                logger.fail(Buffer.concat(errors).toString().trim());
                 process.exitCode = code ?? 1;
                 resolve(code);
             }

package/lib/build.d.ts

@@ -1,23 +1,20 @@
 import type { Config } from "@react-native-community/cli-types";
+import { RNX_FAST_PATH } from "./bin/constants";
+import { setCcacheDir } from "./build/ccache";
 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/android").BuildResult> | Promise<import("./build/apple").BuildResult>;
 export declare const rnxBuildCommand: {
+    [RNX_FAST_PATH]: boolean;
     name: string;
     description: string;
     func: typeof rnxBuild;
     options: ({
         name: string;
         description: string;
-        parse: typeof asSupportedPlatform;
         default?: undefined;
-    } | {
-        name: string;
-        description: string;
         parse?: undefined;
-        default?: undefined;
     } | {
         name: string;
         description: string;
@@ -28,6 +25,11 @@ export declare const rnxBuildCommand: {
         description: string;
         default: string;
         parse: typeof asDestination;
+    } | {
+        name: string;
+        description: string;
+        parse: typeof setCcacheDir;
+        default?: undefined;
     })[];
 };
 export {};

package/lib/build.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rnxBuildCommand = void 0;
 exports.rnxBuild = rnxBuild;
 const commander_1 = require("commander");
+const constants_1 = require("./bin/constants");
 const android_1 = require("./build/android");
+const ccache_1 = require("./build/ccache");
 const ios_1 = require("./build/ios");
 const macos_1 = require("./build/macos");
 function asConfiguration(configuration) {
@@ -48,6 +50,9 @@ function rnxBuild(_argv, config, buildParams) {
     }
 }
 exports.rnxBuildCommand = {
+    // The build command requires the `project` field, which currently requires
+    // loading the full config.
+    [constants_1.RNX_FAST_PATH]: false,
     name: "rnx-build",
     description: "Build your native app for testing in emulator/simulator or on device",
     func: rnxBuild,
@@ -77,6 +82,16 @@ exports.rnxBuildCommand = {
             default: "simulator",
             parse: asDestination,
         },
+        {
+            name: "--ccache-dir <string>",
+            description: "Path to Ccache config",
+            parse: ccache_1.setCcacheDir,
+        },
+        {
+            name: "--ccache-home <string>",
+            description: "Path to Ccache installation",
+            parse: ccache_1.setCcacheHome,
+        },
     ],
 };
 //# sourceMappingURL=build.js.map

package/lib/run.d.ts

@@ -8,13 +8,8 @@ export declare const rnxRunCommand: {
     options: ({
         name: string;
         description: string;
-        parse: (platform: string) => InputParams["platform"];
         default?: undefined;
-    } | {
-        name: string;
-        description: string;
         parse?: undefined;
-        default?: undefined;
     } | {
         name: string;
         description: string;
@@ -25,6 +20,11 @@ export declare const rnxRunCommand: {
         description: string;
         default: string;
         parse: (destination: string) => import("./build/types").DeviceType;
+    } | {
+        name: string;
+        description: string;
+        parse: typeof import("./build/ccache").setCcacheDir;
+        default?: undefined;
     })[];
 };
 //# sourceMappingURL=run.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "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",
@@ -50,7 +50,7 @@
     "@rnx-kit/metro-service": "^4.0.1",
     "@rnx-kit/third-party-notices": "^2.0.0",
     "@rnx-kit/tools-android": "^0.2.0",
-    "@rnx-kit/tools-apple": "^0.2.0",
+    "@rnx-kit/tools-apple": "^0.2.1",
     "@rnx-kit/tools-language": "^3.0.0",
     "@rnx-kit/tools-node": "^3.0.0",
     "@rnx-kit/tools-react-native": "^2.0.0",
@@ -83,7 +83,7 @@
     "@types/jest": "^29.2.1",
     "@types/node": "^20.0.0",
     "@types/qrcode": "^1.4.2",
-    "eslint": "^8.56.0",
+    "eslint": "^9.0.0",
     "jest": "^29.2.1",
     "markdown-table": "^3.0.0",
     "metro": "^0.80.3",