@rnx-kit/cli 0.18.9 → 0.18.11

package/lib/build/android.d.ts

@@ -2,5 +2,5 @@ import type { Config } from "@react-native-community/cli-types";
 import ora from "ora";
 import type { AndroidBuildParams } from "./types";
 export type BuildResult = string | number | null;
-export declare function buildAndroid(config: Config, buildParams: AndroidBuildParams, logger?: ora.Ora): Promise<BuildResult>;
+export declare function buildAndroid(config: Config, buildParams: AndroidBuildParams, additionalArgs: string[], logger?: ora.Ora): Promise<BuildResult>;
 //# sourceMappingURL=android.d.ts.map

package/lib/build/android.js

@@ -7,7 +7,7 @@ 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)()) {
+function buildAndroid(config, buildParams, additionalArgs, logger = (0, ora_1.default)()) {
     const { sourceDir } = config.project.android ?? {};
     if (!sourceDir) {
         (0, cache_1.invalidateState)();
@@ -16,7 +16,7 @@ function buildAndroid(config, buildParams, logger = (0, ora_1.default)()) {
         return Promise.resolve(null);
     }
     return import("@rnx-kit/tools-android").then(({ assemble }) => {
-        const gradle = assemble(sourceDir, buildParams);
+        const gradle = assemble(sourceDir, buildParams, additionalArgs);
         return (0, watcher_1.watch)(gradle, logger, () => sourceDir);
     });
 }

package/lib/build.d.ts

@@ -4,7 +4,7 @@ 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;
-export declare function rnxBuild(_argv: string[], config: Config, buildParams: InputParams): Promise<import("./build/android").BuildResult> | 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: {
     [RNX_FAST_PATH]: boolean;
     name: string;

package/lib/build.js

@@ -38,10 +38,10 @@ function asSupportedPlatform(platform) {
             throw new commander_1.InvalidArgumentError("Supported platforms: 'android', 'ios', 'macos', 'visionos'.");
     }
 }
-function rnxBuild(_argv, config, buildParams) {
+function rnxBuild(argv, config, buildParams) {
     switch (buildParams.platform) {
         case "android":
-            return (0, android_1.buildAndroid)(config, buildParams);
+            return (0, android_1.buildAndroid)(config, buildParams, argv);
         case "ios":
         case "visionos":
             return (0, ios_1.buildIOS)(config, buildParams);

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

@@ -1,4 +1,4 @@
 import type { Config } from "@react-native-community/cli-types";
 import type { AndroidInputParams } from "../build/types";
-export declare function runAndroid(config: Config, buildParams: AndroidInputParams): Promise<void>;
+export declare function runAndroid(config: Config, buildParams: AndroidInputParams, additionalArgs: string[]): Promise<void>;
 //# sourceMappingURL=android.d.ts.map

package/lib/run/android.js

@@ -40,9 +40,9 @@ exports.runAndroid = runAndroid;
 const path = __importStar(require("node:path"));
 const ora_1 = __importDefault(require("ora"));
 const android_1 = require("../build/android");
-async function runAndroid(config, buildParams) {
+async function runAndroid(config, buildParams, additionalArgs) {
     const logger = (0, ora_1.default)();
-    const projectDir = await (0, android_1.buildAndroid)(config, buildParams, logger);
+    const projectDir = await (0, android_1.buildAndroid)(config, buildParams, additionalArgs, logger);
     if (typeof projectDir !== "string") {
         return;
     }

package/lib/run.d.ts

@@ -1,7 +1,7 @@
 import type { Config } from "@react-native-community/cli-types";
 import { RNX_FAST_PATH } from "./bin/constants";
 import type { InputParams } from "./build/types";
-export declare function rnxRun(_argv: string[], config: Config, buildParams: InputParams): Promise<void>;
+export declare function rnxRun(argv: string[], config: Config, buildParams: InputParams): Promise<void>;
 export declare const rnxRunCommand: {
     [RNX_FAST_PATH]: boolean;
     name: string;

package/lib/run.js

@@ -7,10 +7,10 @@ const build_1 = require("./build");
 const android_1 = require("./run/android");
 const ios_1 = require("./run/ios");
 const macos_1 = require("./run/macos");
-function rnxRun(_argv, config, buildParams) {
+function rnxRun(argv, config, buildParams) {
     switch (buildParams.platform) {
         case "android":
-            return (0, android_1.runAndroid)(config, buildParams);
+            return (0, android_1.runAndroid)(config, buildParams, argv);
         case "ios":
         case "visionos":
             return (0, ios_1.runIOS)(config, buildParams);

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.9",
+  "version": "0.18.11",
   "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.6",
+    "@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",
@@ -49,8 +49,9 @@
     "@rnx-kit/metro-serializer-esbuild": "^0.2.1",
     "@rnx-kit/metro-service": "^4.0.2",
     "@rnx-kit/third-party-notices": "^2.0.0",
-    "@rnx-kit/tools-android": "^0.2.0",
+    "@rnx-kit/tools-android": "^0.2.1",
     "@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",
@@ -77,7 +78,6 @@
     "@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": "^22.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