@rnx-kit/cli 0.16.29 → 0.17.0

package/lib/copy-assets.js

@@ -35,9 +35,11 @@ const package_1 = require("@rnx-kit/tools-node/package");
 const path_1 = require("@rnx-kit/tools-node/path");
 const tools_react_native_1 = require("@rnx-kit/tools-react-native");
 const child_process_1 = require("child_process");
-const fs = __importStar(require("fs-extra"));
+const fs = __importStar(require("fs"));
+const nodefs = __importStar(require("fs"));
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
+const filesystem_1 = require("./helpers/filesystem");
 const defaultAndroidConfig = {
     androidPluginVersion: "7.2.2",
     compileSdkVersion: 33,
@@ -47,6 +49,12 @@ const defaultAndroidConfig = {
     },
     kotlinVersion: "1.7.22",
 };
+function cloneFile(src, dest) {
+    return fs.promises.copyFile(src, dest, fs.constants.COPYFILE_FICLONE);
+}
+function cp_r(source, destination, fs = nodefs) {
+    return fs.promises.cp(source, destination, { recursive: true });
+}
 function ensureOption(options, opt, flag = opt) {
     if (options[opt] == null) {
         (0, console_1.error)(`Missing required option: --${flag}`);
@@ -145,7 +153,7 @@ async function assembleAarBundle(context, packageName, { aar }) {
         ...customEnv,
     };
     const outputDir = path.join(context.options.assetsDest, "aar");
-    fs.ensureDirSync(outputDir);
+    (0, filesystem_1.ensureDir)(outputDir);
     const dest = path.join(outputDir, `${targetName}-${version}.aar`);
     const targets = [`:${targetName}:assembleRelease`];
     const targetsToCopy = [[output, dest]];
@@ -169,17 +177,13 @@ async function assembleAarBundle(context, packageName, { aar }) {
         run(gradlew, targets, { cwd: androidProject, stdio: "inherit", env });
     }
     else {
-        const reactNativePath = (0, package_1.findPackageDependencyDir)("react-native");
-        if (!reactNativePath) {
-            throw new Error("Could not find 'react-native'");
-        }
         const buildDir = path.join(process.cwd(), "node_modules", ".rnx-gradle-build", targetName);
         const compileSdkVersion = (_a = android === null || android === void 0 ? void 0 : android.compileSdkVersion) !== null && _a !== void 0 ? _a : defaultAndroidConfig.compileSdkVersion;
         const minSdkVersion = (_c = (_b = android === null || android === void 0 ? void 0 : android.defaultConfig) === null || _b === void 0 ? void 0 : _b.minSdkVersion) !== null && _c !== void 0 ? _c : defaultAndroidConfig.defaultConfig.minSdkVersion;
         const targetSdkVersion = (_e = (_d = android === null || android === void 0 ? void 0 : android.defaultConfig) === null || _d === void 0 ? void 0 : _d.targetSdkVersion) !== null && _e !== void 0 ? _e : defaultAndroidConfig.defaultConfig.targetSdkVersion;
         const androidPluginVersion = (_f = android === null || android === void 0 ? void 0 : android.androidPluginVersion) !== null && _f !== void 0 ? _f : defaultAndroidConfig.androidPluginVersion;
         const kotlinVersion = (_g = android === null || android === void 0 ? void 0 : android.kotlinVersion) !== null && _g !== void 0 ? _g : defaultAndroidConfig.kotlinVersion;
-        const buildRelativeReactNativePath = path.relative(buildDir, reactNativePath);
+        const buildRelativeReactNativePath = path.relative(buildDir, context.reactNativePath);
         const buildGradle = [
             "buildscript {",
             "  ext {",
@@ -219,31 +223,31 @@ async function assembleAarBundle(context, packageName, { aar }) {
             `project(":${targetName}").projectDir = file(${JSON.stringify(androidProject)})`,
             "",
         ].join("\n");
-        fs.ensureDirSync(buildDir);
+        (0, 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);
         // Run only one Gradle task at a time
         run(gradlew, targets, { cwd: buildDir, stdio: "inherit", env });
     }
-    await Promise.all(targetsToCopy.map(([src, dest]) => fs.copy(src, dest)));
+    await Promise.all(targetsToCopy.map(([src, dest]) => cloneFile(src, dest)));
 }
-function copyFiles(files, destination) {
+function copyFiles(files, destination, fs = nodefs) {
     if (!Array.isArray(files) || files.length === 0) {
         return [];
     }
-    fs.ensureDirSync(destination);
+    (0, filesystem_1.ensureDir)(destination, fs);
     return files.map((file) => {
-        return fs.copy(file, `${destination}/${path.basename(file)}`);
+        return cp_r(file, `${destination}/${path.basename(file)}`, fs);
     });
 }
-async function copyAssets({ options: { assetsDest, xcassetsDest } }, packageName, { assets, strings, xcassets }) {
+async function copyAssets({ options: { assetsDest, xcassetsDest } }, packageName, { assets, strings, xcassets }, fs = nodefs) {
     const tasks = [
-        ...copyFiles(assets, `${assetsDest}/assets/${packageName}`),
-        ...copyFiles(strings, `${assetsDest}/strings/${packageName}`),
+        ...copyFiles(assets, `${assetsDest}/assets/${packageName}`, fs),
+        ...copyFiles(strings, `${assetsDest}/strings/${packageName}`, fs),
     ];
     if (typeof xcassetsDest === "string") {
-        tasks.push(...copyFiles(xcassets, xcassetsDest));
+        tasks.push(...copyFiles(xcassets, xcassetsDest, fs));
     }
     await Promise.all(tasks);
 }
@@ -336,10 +340,9 @@ async function gatherConfigs({ projectRoot, manifest, }) {
  *
  * @param options Options dictate what gets copied where
  */
-async function copyProjectAssets(options) {
-    const projectRoot = (0, package_1.findPackageDir)() || process.cwd();
+async function copyProjectAssets(options, { root: projectRoot, reactNativePath }) {
     const manifest = (0, package_1.readPackage)(projectRoot);
-    const context = { projectRoot, manifest, options };
+    const context = { projectRoot, manifest, options, reactNativePath };
     const assetConfigs = await gatherConfigs(context);
     if (!assetConfigs) {
         return;
@@ -372,7 +375,7 @@ async function copyProjectAssets(options) {
             if (output &&
                 (!fs.existsSync(destination) || fs.statSync(destination).isDirectory())) {
                 (0, console_1.info)(`Copying Android Archive of "${dependencyName}"`);
-                copyTasks.push(fs.copy(output, destination));
+                copyTasks.push(cloneFile(output, destination));
             }
         }
         await Promise.all(copyTasks);
@@ -380,30 +383,30 @@ async function copyProjectAssets(options) {
 }
 exports.rnxCopyAssetsCommand = {
     name: "rnx-copy-assets",
-    description: "Copies additional assets not picked by bundlers into desired directory.",
-    func: (_argv, _config, options) => {
+    description: "Copies additional assets not picked by bundlers into desired directory",
+    func: (_argv, config, options) => {
         ensureOption(options, "platform");
         ensureOption(options, "assetsDest", "assets-dest");
-        return copyProjectAssets(options);
+        return copyProjectAssets(options, config);
     },
     options: [
         {
             name: "--platform <string>",
-            description: "platform to target",
+            description: "Platform to target",
             parse: tools_react_native_1.parsePlatform,
         },
         {
             name: "--assets-dest <string>",
-            description: "path of the directory to copy assets into",
+            description: "Path of the directory to copy assets into",
         },
         {
-            name: "--bundle-aar <boolean>",
-            description: "whether to bundle AARs of dependencies",
+            name: "--bundle-aar [boolean]",
+            description: "Whether to bundle AARs of dependencies",
             default: false,
         },
         {
             name: "--xcassets-dest <string>",
-            description: "path of the directory to copy Xcode asset catalogs into. Asset catalogs will only be copied if a destination path is specified.",
+            description: "Path of the directory to copy Xcode asset catalogs into; asset catalogs will only be copied if a destination path is specified",
         },
     ],
 };

package/lib/helpers/externals.d.ts

@@ -0,0 +1,4 @@
+import type { CliServerApi, CoreDevMiddleware } from "../serve/types";
+export declare function requireExternal(module: "@react-native-community/cli-server-api", projectRoot: string, reactNativePath: string): CliServerApi;
+export declare function requireExternal(module: "@react-native/dev-middleware", projectRoot: string, reactNativePath: string): CoreDevMiddleware;
+//# sourceMappingURL=externals.d.ts.map

package/lib/{serve/external.js → helpers/externals.js}

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireExternal = requireExternal;
 const package_1 = require("@rnx-kit/tools-node/package");
-function friendlyRequire(...modules) {
+const context_1 = require("@rnx-kit/tools-react-native/context");
+function friendlyRequire(modules, startDir) {
     try {
-        const modulePath = (0, package_1.resolveDependencyChain)(modules);
+        const modulePath = (0, package_1.resolveDependencyChain)(modules, startDir);
         return require(modulePath);
     }
     catch (_) {
@@ -16,14 +17,15 @@ function friendlyRequire(...modules) {
             "file a bug at https://github.com/microsoft/rnx-kit/issues.");
     }
 }
-function requireExternal(module) {
+function requireExternal(module, projectRoot, reactNativePath) {
     switch (module) {
-        case "@react-native-community/cli-clean":
-            return friendlyRequire("react-native", "@react-native-community/cli", "@react-native-community/cli-clean");
         case "@react-native-community/cli-server-api":
-            return friendlyRequire("react-native", "@react-native-community/cli", "@react-native-community/cli-server-api");
+            return friendlyRequire([
+                "@react-native-community/cli",
+                "@react-native-community/cli-server-api",
+            ], (0, context_1.resolveCommunityCLI)(projectRoot, reactNativePath));
         case "@react-native/dev-middleware":
-            return friendlyRequire("react-native", "@react-native/community-cli-plugin", "@react-native/dev-middleware");
+            return friendlyRequire(["@react-native/community-cli-plugin", "@react-native/dev-middleware"], reactNativePath);
     }
 }
-//# sourceMappingURL=external.js.map
+//# sourceMappingURL=externals.js.map

package/lib/helpers/filesystem.d.ts

@@ -0,0 +1,3 @@
+import * as nodefs from "fs";
+export declare function ensureDir(p: string, fs?: typeof nodefs): void;
+//# sourceMappingURL=filesystem.d.ts.map

package/lib/helpers/filesystem.js

@@ -0,0 +1,31 @@
+"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.ensureDir = ensureDir;
+const nodefs = __importStar(require("fs")); // Cannot use `node:fs` because of Jest mocks
+function ensureDir(p, fs = nodefs) {
+    fs.mkdirSync(p, { recursive: true, mode: 0o755 });
+}
+//# sourceMappingURL=filesystem.js.map

package/lib/{metro-config.js → helpers/metro-config.js}

@@ -7,7 +7,7 @@ const metro_plugin_duplicates_checker_1 = require("@rnx-kit/metro-plugin-duplica
 const metro_plugin_typescript_1 = require("@rnx-kit/metro-plugin-typescript");
 const metro_serializer_1 = require("@rnx-kit/metro-serializer");
 const metro_serializer_esbuild_1 = require("@rnx-kit/metro-serializer-esbuild");
-const defaultPlugins_1 = require("./bundle/defaultPlugins");
+const defaultPlugins_1 = require("../bundle/defaultPlugins");
 function resolvePlugin(name) {
     try {
         return require.resolve(name);

package/lib/{parsers.d.ts → helpers/parsers.d.ts}

@@ -3,5 +3,5 @@ export declare function asBoolean(value: string): boolean;
 export declare function asNumber(value: string): number;
 export declare function asResolvedPath(value: string): string;
 export declare function asStringArray(value: string): string[];
-export declare function parseTransformProfile(val: string): TransformProfile;
+export declare function asTransformProfile(val: string): TransformProfile;
 //# sourceMappingURL=parsers.d.ts.map

package/lib/{parsers.js → helpers/parsers.js}

@@ -27,8 +27,8 @@ exports.asBoolean = asBoolean;
 exports.asNumber = asNumber;
 exports.asResolvedPath = asResolvedPath;
 exports.asStringArray = asStringArray;
-exports.parseTransformProfile = parseTransformProfile;
-const path = __importStar(require("path"));
+exports.asTransformProfile = asTransformProfile;
+const path = __importStar(require("node:path"));
 function asBoolean(value) {
     switch (value) {
         case "false":
@@ -36,7 +36,7 @@ function asBoolean(value) {
         case "true":
             return true;
         default:
-            throw new Error("Invalid boolean value '" + value + "' — must be true or false");
+            throw new Error(`Expected 'true' or 'false; got '${value}'`);
     }
 }
 function asNumber(value) {
@@ -48,18 +48,20 @@ function asResolvedPath(value) {
 function asStringArray(value) {
     return value.split(",");
 }
-function parseTransformProfile(val) {
-    const allowedProfiles = [
-        "hermes-stable",
-        "hermes-canary",
-        "default",
-    ];
-    if (val in allowedProfiles) {
-        return val;
+function asTransformProfile(val) {
+    switch (val) {
+        case "hermes-stable":
+        case "hermes-canary":
+        case "default":
+            return val;
+        default: {
+            const profiles = [
+                "hermes-stable",
+                "hermes-canary",
+                "default",
+            ];
+            throw new Error(`Expected '${profiles.join("', '")}'; got ${val}`);
+        }
     }
-    throw new Error("Invalid transform profile '" +
-        val +
-        "' -- must be one of " +
-        allowedProfiles.join(", "));
 }
 //# sourceMappingURL=parsers.js.map

package/lib/index.d.ts

@@ -1,197 +1,11 @@
+import type { Command } from "@react-native-community/cli-types";
 export declare const reactNativeConfig: {
-    commands: ({
-        name: string;
-        description: string;
-        func: typeof import("./align-deps").rnxAlignDeps;
-        options: {
-            name: string;
-            description: string;
-        }[];
-    } | {
-        name: string;
-        description: string;
-        func: typeof import("./bundle").rnxBundle;
-        options: ({
-            name: string;
-            description: string;
-            parse?: undefined;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("@rnx-kit/tools-react-native").parsePlatform;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: boolean;
-            parse: typeof import("./parsers").asBoolean;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asBoolean;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: string;
-            parse?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asNumber;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").parseTransformProfile;
-            default?: undefined;
-        })[];
-    } | {
-        name: string;
-        func: typeof import("./clean").rnxClean;
-        description: string;
-        options: ({
-            name: string;
-            description: string;
-            default: string;
-            parse?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: string;
-            parse: typeof import("./parsers").asResolvedPath;
-        } | {
-            name: string;
-            description: string;
-            default: boolean;
-            parse?: undefined;
-        })[];
-    } | {
-        name: string;
-        description: string;
-        func: (_argv: string[], _config: import("@react-native-community/cli-types").Config, options: import("./copy-assets").Options) => Promise<void>;
-        options: ({
-            name: string;
-            description: string;
-            parse: typeof import("@rnx-kit/tools-react-native").parsePlatform;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse?: undefined;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: boolean;
-            parse?: undefined;
-        })[];
-    } | {
-        name: string;
-        description: string;
-        func: typeof import("./ram-bundle").rnxRamBundle;
-        options: ({
-            name: string;
-            description: string;
-            parse?: undefined;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("@rnx-kit/tools-react-native").parsePlatform;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: boolean;
-            parse: typeof import("./parsers").asBoolean;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asBoolean;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: string;
-            parse?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asNumber;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").parseTransformProfile;
-            default?: undefined;
-        })[];
-    } | {
-        name: string;
-        func: typeof import("./start").rnxStart;
-        description: string;
-        options: ({
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asNumber;
-            default: number;
-        } | {
-            name: string;
-            description: string;
-            default: string;
-            parse?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asResolvedPath;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: (val: string) => string[];
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse: typeof import("./parsers").asNumber;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            parse?: undefined;
-            default?: undefined;
-        })[];
-    } | {
-        name: string;
-        description: string;
-        func: typeof import("./test").rnxTest;
-        options: {
-            name: string;
-            description?: string;
-            parse?: (val: string) => unknown;
-            default?: string | boolean | number | ((config: import("@react-native-community/cli-types").Config) => string | boolean | number);
-        }[];
-    } | {
-        name: string;
-        description: string;
-        func: typeof import("./write-third-party-notices").rnxWriteThirdPartyNotices;
-        options: ({
-            name: string;
-            description: string;
-            default?: undefined;
-        } | {
-            name: string;
-            description: string;
-            default: boolean;
-        })[];
-    })[];
+    commands: Command<false>[];
 };
 export { rnxAlignDeps, rnxAlignDepsCommand } from "./align-deps";
 export { rnxBundle, rnxBundleCommand } from "./bundle";
 export { rnxClean, rnxCleanCommand } from "./clean";
 export { copyProjectAssets, rnxCopyAssetsCommand } from "./copy-assets";
-export { asBoolean, asNumber, parseTransformProfile } from "./parsers";
 export { rnxRamBundle, rnxRamBundleCommand } from "./ram-bundle";
 export { rnxStart, rnxStartCommand } from "./start";
 export { rnxTest, rnxTestCommand } from "./test";

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rnxWriteThirdPartyNoticesCommand = exports.rnxWriteThirdPartyNotices = exports.rnxTestCommand = exports.rnxTest = exports.rnxStartCommand = exports.rnxStart = exports.rnxRamBundleCommand = exports.rnxRamBundle = exports.parseTransformProfile = exports.asNumber = exports.asBoolean = exports.rnxCopyAssetsCommand = exports.copyProjectAssets = exports.rnxCleanCommand = exports.rnxClean = exports.rnxBundleCommand = exports.rnxBundle = exports.rnxAlignDepsCommand = exports.rnxAlignDeps = exports.reactNativeConfig = void 0;
+exports.rnxWriteThirdPartyNoticesCommand = exports.rnxWriteThirdPartyNotices = exports.rnxTestCommand = exports.rnxTest = exports.rnxStartCommand = exports.rnxStart = exports.rnxRamBundleCommand = exports.rnxRamBundle = exports.rnxCopyAssetsCommand = exports.copyProjectAssets = exports.rnxCleanCommand = exports.rnxClean = exports.rnxBundleCommand = exports.rnxBundle = exports.rnxAlignDepsCommand = exports.rnxAlignDeps = exports.reactNativeConfig = void 0;
 const align_deps_1 = require("./align-deps");
 const bundle_1 = require("./bundle");
 const clean_1 = require("./clean");
@@ -33,10 +33,6 @@ Object.defineProperty(exports, "rnxCleanCommand", { enumerable: true, get: funct
 var copy_assets_2 = require("./copy-assets");
 Object.defineProperty(exports, "copyProjectAssets", { enumerable: true, get: function () { return copy_assets_2.copyProjectAssets; } });
 Object.defineProperty(exports, "rnxCopyAssetsCommand", { enumerable: true, get: function () { return copy_assets_2.rnxCopyAssetsCommand; } });
-var parsers_1 = require("./parsers");
-Object.defineProperty(exports, "asBoolean", { enumerable: true, get: function () { return parsers_1.asBoolean; } });
-Object.defineProperty(exports, "asNumber", { enumerable: true, get: function () { return parsers_1.asNumber; } });
-Object.defineProperty(exports, "parseTransformProfile", { enumerable: true, get: function () { return parsers_1.parseTransformProfile; } });
 var ram_bundle_2 = require("./ram-bundle");
 Object.defineProperty(exports, "rnxRamBundle", { enumerable: true, get: function () { return ram_bundle_2.rnxRamBundle; } });
 Object.defineProperty(exports, "rnxRamBundleCommand", { enumerable: true, get: function () { return ram_bundle_2.rnxRamBundleCommand; } });

package/lib/ram-bundle.d.ts

@@ -22,11 +22,11 @@ export declare const rnxRamBundleCommand: {
         name: string;
         description: string;
         default: boolean;
-        parse: typeof import("./parsers").asBoolean;
+        parse: typeof import("./helpers/parsers").asBoolean;
     } | {
         name: string;
         description: string;
-        parse: typeof import("./parsers").asBoolean;
+        parse: typeof import("./helpers/parsers").asBoolean;
         default?: undefined;
     } | {
         name: string;
@@ -36,12 +36,12 @@ export declare const rnxRamBundleCommand: {
     } | {
         name: string;
         description: string;
-        parse: typeof import("./parsers").asNumber;
+        parse: typeof import("./helpers/parsers").asNumber;
         default?: undefined;
     } | {
         name: string;
         description: string;
-        parse: typeof import("./parsers").parseTransformProfile;
+        parse: typeof import("./helpers/parsers").asTransformProfile;
         default?: undefined;
     })[];
 };

package/lib/ram-bundle.js

@@ -34,13 +34,13 @@ async function rnxRamBundle(_argv, cliConfig, cliOptions) {
 }
 exports.rnxRamBundleCommand = {
     name: "rnx-ram-bundle",
-    description: "Bundle your rnx-kit package in the RAM bundle format for offline use. See https://aka.ms/rnx-kit.",
+    description: "[Deprecated] Bundle your JavaScript in the RAM bundle format for offline use",
     func: rnxRamBundle,
     options: [
         ...cliOptions_1.commonBundleCommandOptions,
         {
             name: "--indexed-ram-bundle",
-            description: 'Force the "Indexed RAM" bundle file format, even when targeting Android.',
+            description: 'Force the "Indexed RAM" bundle file format, even when targeting Android',
         },
     ],
 };

package/lib/serve/keyboard.js

@@ -5,9 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attachKeyHandlers = attachKeyHandlers;
 const console_1 = require("@rnx-kit/console");
-const node_fetch_1 = __importDefault(require("node-fetch"));
+const node_readline_1 = __importDefault(require("node:readline"));
 const qrcode_1 = __importDefault(require("qrcode"));
-const readline_1 = __importDefault(require("readline"));
 function attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal, }) {
     process.stdin.setRawMode(true);
     process.stdin.on("keypress", (_key, data) => {
@@ -34,9 +33,7 @@ function attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal
                     break;
                 case "j": {
                     (0, console_1.info)("Opening debugger...");
-                    // TODO: Remove `node-fetch` when we drop support for Node 16
-                    const ftch = "fetch" in globalThis ? fetch : node_fetch_1.default;
-                    ftch(devServerUrl + "/open-debugger", { method: "POST" });
+                    fetch(devServerUrl + "/open-debugger", { method: "POST" });
                     break;
                 }
                 case "q": {
@@ -58,6 +55,6 @@ function attachKeyHandlers({ devServerUrl, help, messageSocketEndpoint, terminal
             }
         }
     });
-    readline_1.default.emitKeypressEvents(process.stdin);
+    node_readline_1.default.emitKeypressEvents(process.stdin);
 }
 //# sourceMappingURL=keyboard.js.map

package/lib/serve/types.d.ts

@@ -1,8 +1,8 @@
 import type * as logger from "@rnx-kit/console";
 import type { Server as Middleware } from "connect";
-import type { Server as HttpServer } from "http";
-import type { Server as HttpsServer } from "https";
 import type { RunServerOptions } from "metro";
+import type { Server as HttpServer } from "node:http";
+import type { Server as HttpsServer } from "node:https";
 type MiddlewareOptions = {
     host?: string;
     watchFolders: readonly string[];

package/lib/start.d.ts

@@ -1,5 +1,5 @@
 import type { Config } from "@react-native-community/cli-types";
-import { asNumber, asResolvedPath } from "./parsers";
+import { asNumber, asResolvedPath } from "./helpers/parsers";
 import type { StartCommandArgs } from "./serve/types";
 export declare function rnxStart(_argv: string[], ctx: Config, args: StartCommandArgs): Promise<void>;
 export declare const rnxStartCommand: {