@rnx-kit/cli 0.14.8 → 0.14.10

package/lib/test.js

@@ -1,14 +1,42 @@
 "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.rnxTestCommand = exports.rnxTest = void 0;
 const console_1 = require("@rnx-kit/console");
 const tools_node_1 = require("@rnx-kit/tools-node");
 const platform_1 = require("@rnx-kit/tools-react-native/platform");
+const path = __importStar(require("path"));
 const COMMAND_NAME = "rnx-test";
+function resolveJestCli() {
+    const jestPath = path.dirname(require.resolve("jest/package.json"));
+    return require.resolve("jest-cli", { paths: [jestPath] });
+}
 function rnxTest(_argv, _config, { platform }) {
     const runJest = (() => {
         try {
-            const { run } = require("jest-cli");
+            const { run } = require(resolveJestCli());
             return run;
         }
         catch (e) {
@@ -41,16 +69,21 @@ function jestOptions() {
     //
     // To work around this, resolve `jest-cli` first, then use the resolved path
     // to import `./build/cli/args`.
-    const jestPath = (0, tools_node_1.findPackageDependencyDir)("jest-cli") || "jest-cli";
-    const { options } = require(`${jestPath}/build/cli/args`);
-    return Object.keys(options).map((option) => {
-        const { default: defaultValue, description, type } = options[option];
-        return {
-            name: `--${option} [${type}]`,
-            description,
-            default: defaultValue,
-        };
-    });
+    try {
+        const jestPath = (0, tools_node_1.findPackageDependencyDir)(resolveJestCli()) || "jest-cli";
+        const { options } = require(`${jestPath}/build/cli/args`);
+        return Object.keys(options).map((option) => {
+            const { default: defaultValue, description, type } = options[option];
+            return {
+                name: `--${option} [${type}]`,
+                description,
+                default: defaultValue,
+            };
+        });
+    }
+    catch (_) {
+        return [];
+    }
 }
 exports.rnxTestCommand = {
     name: COMMAND_NAME,

package/lib/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;AACA,8CAAyC;AACzC,oDAA+D;AAC/D,mEAAqE;AAiBrE,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,SAAgB,OAAO,CACrB,KAAe,EACf,OAAkB,EAClB,EAAE,QAAQ,EAAQ;IAElB,MAAM,OAAO,GAA6B,CAAC,GAAG,EAAE;QAC9C,IAAI;YACF,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YACpC,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,eAAK,EAAC,+DAA+D,CAAC,CAAC;YACvE,MAAM,CAAC,CAAC;SACT;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,YAAY,GAAG,CAAC,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,4EAA4E;IAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACjD,IAAI,aAAa,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,yEAAyE;IACzE,qEAAqE;IACrE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAE9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAlCD,0BAkCC;AAED,SAAS,WAAW;IAClB,oDAAoD;IACpD,EAAE;IACF,oEAAoE;IACpE,wCAAwC;IACxC,EAAE;IACF,4EAA4E;IAC5E,gCAAgC;IAChC,MAAM,QAAQ,GAAG,IAAA,qCAAwB,EAAC,UAAU,CAAC,IAAI,UAAU,CAAC;IACpE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAC;IAE1D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACzC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QACrE,OAAO;YACL,IAAI,EAAE,KAAK,MAAM,KAAK,IAAI,GAAG;YAC7B,WAAW;YACX,OAAO,EAAE,YAAY;SACtB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAEY,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,mCAAmC;IAChD,IAAI,EAAE,OAAO;IACb,OAAO,EAAE;QACP;YACE,IAAI,EAAE,8CAA8C;YACpD,WAAW,EAAE,oBAAoB;YACjC,KAAK,EAAE,wBAAa;SACrB;QACD,GAAG,WAAW,EAAE;KACjB;CACF,CAAC"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,8CAAyC;AACzC,oDAA+D;AAC/D,mEAAqE;AACrE,2CAA6B;AAiB7B,MAAM,YAAY,GAAG,UAAU,CAAC;AAEhC,SAAS,cAAc;IACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACpE,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,SAAgB,OAAO,CACrB,KAAe,EACf,OAAkB,EAClB,EAAE,QAAQ,EAAQ;IAElB,MAAM,OAAO,GAA6B,CAAC,GAAG,EAAE;QAC9C,IAAI;YACF,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;YAC1C,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,eAAK,EAAC,+DAA+D,CAAC,CAAC;YACvE,MAAM,CAAC,CAAC;SACT;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACxD,IAAI,YAAY,GAAG,CAAC,EAAE;QACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,4EAA4E;IAC5E,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IAElD,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IACjD,IAAI,aAAa,GAAG,CAAC,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;KACxD;IAED,yEAAyE;IACzE,qEAAqE;IACrE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAE9B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAlCD,0BAkCC;AAED,SAAS,WAAW;IAClB,oDAAoD;IACpD,EAAE;IACF,oEAAoE;IACpE,wCAAwC;IACxC,EAAE;IACF,4EAA4E;IAC5E,gCAAgC;IAChC,IAAI;QACF,MAAM,QAAQ,GAAG,IAAA,qCAAwB,EAAC,cAAc,EAAE,CAAC,IAAI,UAAU,CAAC;QAE1E,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAC;QAE1D,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACzC,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YACrE,OAAO;gBACL,IAAI,EAAE,KAAK,MAAM,KAAK,IAAI,GAAG;gBAC7B,WAAW;gBACX,OAAO,EAAE,YAAY;aACtB,CAAC;QACJ,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAEY,QAAA,cAAc,GAAG;IAC5B,IAAI,EAAE,YAAY;IAClB,WAAW,EAAE,mCAAmC;IAChD,IAAI,EAAE,OAAO;IACb,OAAO,EAAE;QACP;YACE,IAAI,EAAE,8CAA8C;YACpD,WAAW,EAAE,oBAAoB;YACjC,KAAK,EAAE,wBAAa;SACrB;QACD,GAAG,WAAW,EAAE;KACjB;CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.14.8",
+  "version": "0.14.10",
   "description": "Command-line interface for working with kit packages in your repo",
   "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli",
   "license": "MIT",
@@ -21,14 +21,14 @@
   "dependencies": {
     "@rnx-kit/config": "^0.5.2",
     "@rnx-kit/console": "^1.0.11",
-    "@rnx-kit/dep-check": "^1.12.23",
+    "@rnx-kit/dep-check": "^1.13.5",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.0.21",
     "@rnx-kit/metro-plugin-duplicates-checker": "^2.0.0",
     "@rnx-kit/metro-serializer": "^1.0.11",
     "@rnx-kit/metro-serializer-esbuild": "^0.1.0",
     "@rnx-kit/metro-service": "^3.0.2",
     "@rnx-kit/third-party-notices": "^1.2.13",
-    "@rnx-kit/tools-language": "^1.3.0",
+    "@rnx-kit/tools-language": "^1.4.1",
     "@rnx-kit/tools-node": "^1.2.7",
     "@rnx-kit/tools-react-native": "^1.2.0",
     "@rnx-kit/typescript-react-native-resolver": "^0.2.0",
@@ -47,6 +47,9 @@
   "peerDependenciesMeta": {
     "@react-native-community/cli-server-api": {
       "optional": true
+    },
+    "jest-cli": {
+      "optional": true
     }
   },
   "devDependencies": {

package/src/copy-assets.ts

@@ -1,6 +1,7 @@
 import type { Config as CLIConfig } from "@react-native-community/cli-types";
 import { error, info, warn } from "@rnx-kit/console";
 import { isNonEmptyArray } from "@rnx-kit/tools-language/array";
+import { keysOf } from "@rnx-kit/tools-language/properties";
 import type { PackageManifest } from "@rnx-kit/tools-node/package";
 import {
   findPackageDependencyDir,
@@ -93,10 +94,6 @@ function isAssetsConfig(config: unknown): config is AssetsConfig {
   return typeof config === "object" && config !== null && "getAssets" in config;
 }
 
-function keysOf(record: Record<string, unknown> | undefined): string[] {
-  return record ? Object.keys(record) : [];
-}
-
 export function versionOf(pkgName: string): string {
   const packageDir = findPackageDependencyDir(pkgName);
   if (!packageDir) {

package/src/test.ts

@@ -2,6 +2,7 @@ import type { Config as CLIConfig } from "@react-native-community/cli-types";
 import { error } from "@rnx-kit/console";
 import { findPackageDependencyDir } from "@rnx-kit/tools-node";
 import { parsePlatform } from "@rnx-kit/tools-react-native/platform";
+import * as path from "path";
 
 type Args = {
   platform: "android" | "ios" | "macos" | "windows" | "win32";
@@ -20,6 +21,11 @@ type Options = {
 
 const COMMAND_NAME = "rnx-test";
 
+function resolveJestCli(): string {
+  const jestPath = path.dirname(require.resolve("jest/package.json"));
+  return require.resolve("jest-cli", { paths: [jestPath] });
+}
+
 export function rnxTest(
   _argv: string[],
   _config: CLIConfig,
@@ -27,7 +33,7 @@ export function rnxTest(
 ): void {
   const runJest: (argv: string[]) => void = (() => {
     try {
-      const { run } = require("jest-cli");
+      const { run } = require(resolveJestCli());
       return run;
     } catch (e) {
       error("'rnx-test' is unavailable because 'jest-cli' is not installed");
@@ -64,17 +70,22 @@ function jestOptions(): Options[] {
   //
   // To work around this, resolve `jest-cli` first, then use the resolved path
   // to import `./build/cli/args`.
-  const jestPath = findPackageDependencyDir("jest-cli") || "jest-cli";
-  const { options } = require(`${jestPath}/build/cli/args`);
+  try {
+    const jestPath = findPackageDependencyDir(resolveJestCli()) || "jest-cli";
 
-  return Object.keys(options).map((option) => {
-    const { default: defaultValue, description, type } = options[option];
-    return {
-      name: `--${option} [${type}]`,
-      description,
-      default: defaultValue,
-    };
-  });
+    const { options } = require(`${jestPath}/build/cli/args`);
+
+    return Object.keys(options).map((option) => {
+      const { default: defaultValue, description, type } = options[option];
+      return {
+        name: `--${option} [${type}]`,
+        description,
+        default: defaultValue,
+      };
+    });
+  } catch (_) {
+    return [];
+  }
 }
 
 export const rnxTestCommand = {