@rnx-kit/cli 0.18.8 → 0.18.10

package/lib/bundle/hermes.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.emitBytecode = emitBytecode;
 const console_1 = require("@rnx-kit/console");
+const tools_filesystem_1 = require("@rnx-kit/tools-filesystem");
 const package_1 = require("@rnx-kit/tools-node/package");
 const metro_1 = require("@rnx-kit/tools-react-native/metro");
 const node_child_process_1 = require("node:child_process");
@@ -121,7 +122,7 @@ function emitBytecode(cliConfig, input, sourcemap, options) {
         // @ts-expect-error Property 'composeSourceMaps' does not exist
         const { composeSourceMaps } = (0, metro_1.requireModuleFromMetro)("metro-source-map");
         const composed = composeSourceMaps([packagerSourcemap, compilerSourcemap]);
-        fs.writeFileSync(outputMap, JSON.stringify(composed));
+        (0, tools_filesystem_1.writeJSONFile)(outputMap, composed, 0);
     }
 }
 //# sourceMappingURL=hermes.js.map

package/lib/bundle/metro.js

@@ -36,9 +36,9 @@ 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 tools_filesystem_1 = require("@rnx-kit/tools-filesystem");
 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");
 /**
  * Run the Metro bundler.
@@ -74,12 +74,12 @@ async function metroBundle(metroConfig, bundleConfig, dev, minify, output = metr
         minify,
     };
     // ensure all output directories exist
-    (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.bundleOutput), fs);
+    (0, tools_filesystem_1.ensureDir)(path.dirname(metroBundleArgs.bundleOutput), fs);
     if (metroBundleArgs.sourcemapOutput) {
-        (0, filesystem_1.ensureDir)(path.dirname(metroBundleArgs.sourcemapOutput), fs);
+        (0, tools_filesystem_1.ensureDir)(path.dirname(metroBundleArgs.sourcemapOutput), fs);
     }
     if (metroBundleArgs.assetsDest) {
-        (0, filesystem_1.ensureDir)(metroBundleArgs.assetsDest, fs);
+        (0, tools_filesystem_1.ensureDir)(metroBundleArgs.assetsDest, fs);
     }
     // create the bundle
     await output(metroBundleArgs, metroConfig);

package/lib/clean.js

@@ -49,9 +49,8 @@ async function rnxClean(_argv, { root = process.cwd() }, cliOptions) {
     if (!(0, node_fs_1.existsSync)(root)) {
         throw new Error(`Invalid project root: ${root}`);
     }
-    const npm = os.platform() === "win32" ? "npm.cmd" : "npm";
-    const yarn = os.platform() === "win32" ? "yarn.cmd" : "yarn";
-    const execute = (command, args, cwd = root) => {
+    const isWindows = os.platform() === "win32";
+    const execute = (command, args, cwd = root, onError) => {
         return new Promise((resolve, reject) => {
             const process = (0, node_child_process_1.spawn)(command, args, {
                 cwd,
@@ -60,92 +59,123 @@ async function rnxClean(_argv, { root = process.cwd() }, cliOptions) {
             });
             process.on("error", (e) => {
                 const code = "code" in e ? e.code : "errno" in e ? e.errno : "1";
-                reject(`${e.message} (code: ${code})`);
+                switch (code) {
+                    case "ENOENT":
+                        reject(`Unknown command: ${command}`);
+                        break;
+                    default:
+                        reject(`${e.message} (code: ${code})`);
+                        break;
+                }
             });
             process.on("close", (code) => {
                 if (code === 0) {
                     resolve();
                 }
+                else if (onError) {
+                    onError(code);
+                    resolve();
+                }
+                else {
+                    reject(code);
+                }
             });
         });
     };
     const COMMANDS = {
-        android: [
-            {
-                label: "Clean Gradle cache",
-                action: () => {
-                    const candidates = os.platform() === "win32"
-                        ? ["android/gradlew.bat", "gradlew.bat"]
-                        : ["android/gradlew", "gradlew"];
-                    const gradlew = findPath(root, candidates);
-                    if (gradlew) {
-                        const script = path.basename(gradlew);
-                        return execute(os.platform() === "win32" ? script : `./${script}`, ["clean"], path.dirname(gradlew));
-                    }
-                    else {
-                        return Promise.resolve();
-                    }
-                },
-            },
-        ],
-        cocoapods: [
-            {
-                label: "Clean CocoaPods cache",
-                action: () => execute("pod", ["cache", "clean", "--all"]),
-            },
-        ],
-        metro: [
-            {
-                label: "Clean Metro cache",
-                action: () => cleanDir(`${os.tmpdir()}/metro-*`),
-            },
-            {
-                label: "Clean Haste cache",
-                action: () => cleanDir(`${os.tmpdir()}/haste-map-*`),
-            },
-            {
-                label: "Clean React Native cache",
-                action: () => cleanDir(`${os.tmpdir()}/react-*`),
-            },
-        ],
-        npm: [
-            {
-                label: "Remove node_modules",
-                action: () => cleanDir(`${root}/node_modules`),
-            },
-            ...(cliOptions.verifyCache
-                ? [
-                    {
-                        label: "Verify npm cache",
-                        action: () => execute(npm, ["cache", "verify"]),
+        get android() {
+            return [
+                {
+                    label: "Clean Gradle cache",
+                    action: () => {
+                        const candidates = isWindows
+                            ? ["android/gradlew.bat", "gradlew.bat"]
+                            : ["android/gradlew", "gradlew"];
+                        const gradlew = findPath(root, candidates);
+                        if (gradlew) {
+                            const script = path.basename(gradlew);
+                            return execute(isWindows ? script : `./${script}`, ["clean"], path.dirname(gradlew));
+                        }
+                        else {
+                            return Promise.resolve();
+                        }
                     },
-                ]
-                : []),
-        ],
-        watchman: [
-            {
-                label: "Stop Watchman",
-                action: () => execute(os.platform() === "win32" ? "tskill" : "killall", [
-                    "watchman",
-                ]),
-            },
-            {
-                label: "Delete Watchman cache",
-                action: () => execute("watchman", ["watch-del-all"]),
-            },
-        ],
-        xcode: [
-            {
-                label: "Clean Xcode Simulator cache",
-                action: () => cleanDir(`${os.homedir()}/Library/Developer/CoreSimulator/Caches`),
-            },
-        ],
-        yarn: [
-            {
-                label: "Clean Yarn cache",
-                action: () => execute(yarn, ["cache", "clean"]),
-            },
-        ],
+                },
+            ];
+        },
+        get cocoapods() {
+            return [
+                {
+                    label: "Clean CocoaPods cache",
+                    action: () => execute("pod", ["cache", "clean", "--all"]),
+                },
+            ];
+        },
+        get metro() {
+            const tmpdir = os.tmpdir();
+            return [
+                {
+                    label: "Clean Metro cache",
+                    action: () => cleanDir(`${tmpdir}/metro-*`),
+                },
+                {
+                    label: "Clean Haste cache",
+                    action: () => cleanDir(`${tmpdir}/haste-map-*`),
+                },
+                {
+                    label: "Clean React Native cache",
+                    action: () => cleanDir(`${tmpdir}/react-*`),
+                },
+            ];
+        },
+        get npm() {
+            const npm = isWindows ? "npm.cmd" : "npm";
+            return [
+                {
+                    label: "Remove node_modules",
+                    action: () => cleanDir(`${root}/node_modules`),
+                },
+                ...(cliOptions.verifyCache
+                    ? [
+                        {
+                            label: "Verify npm cache",
+                            action: () => execute(npm, ["cache", "verify"]),
+                        },
+                    ]
+                    : []),
+            ];
+        },
+        get watchman() {
+            const kill = isWindows ? "tskill" : "killall";
+            const ignoreError = () => void 0;
+            return [
+                {
+                    label: "Stop Watchman",
+                    action: () => execute(kill, ["watchman"], root, ignoreError),
+                },
+                {
+                    label: "Delete Watchman cache",
+                    action: () => execute("watchman", ["watch-del-all"]),
+                },
+            ];
+        },
+        get xcode() {
+            return [
+                {
+                    label: "Clean Xcode Simulator cache",
+                    action: () => cleanDir(`${os.homedir()}/Library/Developer/CoreSimulator/Caches`),
+                },
+            ];
+        },
+        get yarn() {
+            const yarn = isWindows ? "yarn.cmd" : "yarn";
+            return [
+                {
+                    label: "Clean Yarn cache",
+                    action: () => execute(yarn, ["cache", "clean"]),
+                },
+            ];
+        },
     };
     const categories = cliOptions.include?.split(",") ?? ["metro", "watchman"];
     const spinner = (0, ora_1.default)();

package/lib/copy-assets.js

@@ -40,6 +40,7 @@ exports.copyAssets = copyAssets;
 exports.gatherConfigs = gatherConfigs;
 exports.copyProjectAssets = copyProjectAssets;
 const console_1 = require("@rnx-kit/console");
+const tools_filesystem_1 = require("@rnx-kit/tools-filesystem");
 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");
@@ -48,7 +49,6 @@ 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",
     compileSdkVersion: 33,
@@ -161,7 +161,7 @@ async function assembleAarBundle(context, packageName, { aar }, fs = nodefs) {
         ...customEnv,
     };
     const outputDir = path.join(context.options.assetsDest, "aar");
-    (0, filesystem_1.ensureDir)(outputDir);
+    (0, tools_filesystem_1.ensureDir)(outputDir);
     const dest = path.join(outputDir, `${targetName}-${version}.aar`);
     const targets = [`:${targetName}:assembleRelease`];
     const targetsToCopy = [[output, dest]];
@@ -234,7 +234,7 @@ async function assembleAarBundle(context, packageName, { aar }, fs = nodefs) {
             `project(":${targetName}").projectDir = file(${JSON.stringify(androidProject)})`,
             "",
         ].join("\n");
-        (0, filesystem_1.ensureDir)(buildDir);
+        (0, tools_filesystem_1.ensureDir)(buildDir);
         fs.writeFileSync(path.join(buildDir, "build.gradle"), buildGradle);
         fs.writeFileSync(path.join(buildDir, "gradle.properties"), gradleProperties);
         fs.writeFileSync(path.join(buildDir, "settings.gradle"), settingsGradle);
@@ -247,7 +247,7 @@ function copyFiles(files, destination, fs = nodefs) {
     if (!Array.isArray(files) || files.length === 0) {
         return [];
     }
-    (0, filesystem_1.ensureDir)(destination, fs);
+    (0, tools_filesystem_1.ensureDir)(destination, fs);
     return files.map((file) => {
         return cp_r(file, `${destination}/${path.basename(file)}`, fs);
     });

package/lib/serve/keyboard.d.ts

@@ -1,6 +1,9 @@
 import type { MetroTerminal } from "@rnx-kit/metro-service";
 import type { Server } from "node:http";
 import type { DevServerMiddleware } from "./types";
+type HttpServer = Server & {
+    httpServer?: Server;
+};
 type Params = {
     devServerUrl: string;
     help: () => void;
@@ -8,6 +11,6 @@ type Params = {
     metroTerminal: MetroTerminal;
     reactNativePath: string;
 };
-export declare function attachKeyHandlers(server: Server, params: Params): void;
+export declare function attachKeyHandlers(server: HttpServer, params: Params): void;
 export {};
 //# sourceMappingURL=keyboard.d.ts.map

package/lib/serve/keyboard.js

@@ -72,8 +72,9 @@ function attachKeyHandlers(server, params) {
         process.stdin.pause();
         process.stdin.setRawMode(false);
         (0, console_1.info)("Exiting...");
-        server.close();
-        server.closeAllConnections?.(); // This method was added in Node v18.2.0
+        const httpServer = server.httpServer ?? server;
+        httpServer.close();
+        httpServer.closeAllConnections?.(); // This method was added in Node v18.2.0
         // Even when we close all connections, clients may keep the server alive.
         process.exit();
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.18.8",
+  "version": "0.18.10",
   "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",
@@ -39,7 +39,7 @@
     "test": "rnx-kit-scripts test"
   },
   "dependencies": {
-    "@rnx-kit/align-deps": "^3.0.5",
+    "@rnx-kit/align-deps": "^3.1.0",
     "@rnx-kit/config": "^0.7.0",
     "@rnx-kit/console": "^2.0.0",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^2.0.0",
@@ -51,6 +51,7 @@
     "@rnx-kit/third-party-notices": "^2.0.0",
     "@rnx-kit/tools-android": "^0.2.0",
     "@rnx-kit/tools-apple": "^0.2.1",
+    "@rnx-kit/tools-filesystem": "^0.1.0",
     "@rnx-kit/tools-language": "^3.0.0",
     "@rnx-kit/tools-node": "^3.0.0",
     "@rnx-kit/tools-react-native": "^2.0.3",
@@ -73,21 +74,20 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
-    "@react-native-community/cli-types": "^15.0.0",
+    "@react-native-community/cli-types": "^15.0.1",
     "@rnx-kit/eslint-config": "*",
     "@rnx-kit/jest-preset": "*",
     "@rnx-kit/scripts": "*",
-    "@rnx-kit/tools-filesystem": "*",
     "@rnx-kit/tsconfig": "*",
     "@types/connect": "^3.4.36",
-    "@types/node": "^20.0.0",
+    "@types/node": "^22.0.0",
     "@types/qrcode": "^1.4.2",
     "markdown-table": "^3.0.0",
-    "metro": "^0.81.0",
-    "metro-babel-transformer": "^0.81.0",
-    "metro-config": "^0.81.0",
-    "react": "18.3.1",
-    "react-native": "^0.76.0",
+    "metro": "^0.81.3",
+    "metro-babel-transformer": "^0.81.3",
+    "metro-config": "^0.81.3",
+    "react": "19.0.0",
+    "react-native": "^0.78.0",
     "tsx": "^4.15.0",
     "type-fest": "^4.0.0"
   },

package/lib/helpers/filesystem.d.ts

@@ -1,3 +0,0 @@
-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

@@ -1,41 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureDir = ensureDir;
-const nodefs = __importStar(require("node:fs"));
-function ensureDir(p, fs = nodefs) {
-    fs.mkdirSync(p, { recursive: true, mode: 0o755 });
-}
-//# sourceMappingURL=filesystem.js.map