@rnx-kit/cli 0.18.1 → 0.18.2

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,8 +1,8 @@
 import type { Config } from "@react-native-community/cli-types";
+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: {
     name: string;
@@ -11,13 +11,8 @@ export declare const rnxBuildCommand: {
     options: ({
         name: string;
         description: string;
-        parse: typeof asSupportedPlatform;
         default?: undefined;
-    } | {
-        name: string;
-        description: string;
         parse?: undefined;
-        default?: undefined;
     } | {
         name: string;
         description: string;
@@ -28,6 +23,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

@@ -4,6 +4,7 @@ exports.rnxBuildCommand = void 0;
 exports.rnxBuild = rnxBuild;
 const commander_1 = require("commander");
 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) {
@@ -77,6 +78,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.2",
   "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",