@rnx-kit/cli 0.16.9 → 0.16.10

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;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"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.16.9",
+  "version": "0.16.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",
@@ -67,10 +67,10 @@
     "@types/metro-config": "^0.76.0",
     "@types/qrcode": "^1.4.2",
     "eslint": "^8.0.0",
-    "jest": "^29.0.0",
-    "memfs": "^3.4.1",
+    "jest": "^29.2.1",
+    "memfs": "^4.0.0",
     "metro-config": "^0.73.7",
-    "prettier": "^2.8.0",
+    "prettier": "^3.0.0",
     "type-fest": "^3.0.0",
     "typescript": "^5.0.0"
   },

package/src/test.ts

@@ -1,6 +1,6 @@
 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 { findPackageDir } from "@rnx-kit/tools-node";
 import { parsePlatform } from "@rnx-kit/tools-react-native/platform";
 import * as path from "path";
 
@@ -21,7 +21,7 @@ type Options = {
 
 const COMMAND_NAME = "rnx-test";
 
-function resolveJestCli(): string {
+export function resolveJestCli(): string {
   const jestPath = path.dirname(require.resolve("jest/package.json"));
   return require.resolve("jest-cli", { paths: [jestPath] });
 }
@@ -62,30 +62,55 @@ export function rnxTest(
   runJest(argv);
 }
 
-function jestOptions(): Options[] {
-  // Starting with Jest 27, we are getting this error:
-  //
-  // Package subpath './build/cli/args' is not defined by "exports" in
-  // /~/node_modules/jest-cli/package.json
-  //
-  // To work around this, resolve `jest-cli` first, then use the resolved path
-  // to import `./build/cli/args`.
-  try {
-    const jestPath = 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 [];
-  }
+export function jestOptions(): Options[] {
+  const options = (() => {
+    try {
+      // `yargsOptions` is exported as of 29.5.0
+      // https://github.com/jestjs/jest/commit/0e8ed24a527b951efe11ed49da46e0bd8c0ebef9
+      const { yargsOptions } = require("jest-cli");
+      if (yargsOptions) {
+        return yargsOptions;
+      }
+    } catch (_) {
+      // ignore
+    }
+
+    // Starting with Jest 27, we are getting this error:
+    //
+    // Package subpath './build/cli/args' is not defined by "exports" in
+    // /~/node_modules/jest-cli/package.json
+    //
+    // To work around this, resolve `jest-cli` first, then use the resolved
+    // path to import `./build/cli/args`.
+    const jestPath = findPackageDir(resolveJestCli()) || "jest-cli";
+
+    try {
+      // `args.js` was moved in 29.2.0
+      // https://github.com/jestjs/jest/commit/2ecf723c50c5d25b2fe94e1ff8081f36aed9d67b
+      const { options } = require(`${jestPath}/build/args`);
+      return options;
+    } catch (_) {
+      // ignore
+    }
+
+    try {
+      const { options } = require(`${jestPath}/build/cli/args`);
+      return options;
+    } catch (_) {
+      // ignore
+    }
+
+    return {};
+  })();
+  return Object.keys(options).map((option) => {
+    const { alias, default: defaultValue, description, type } = options[option];
+    const name = `--${option} [${type}]`;
+    return {
+      name: alias ? `-${alias}, ${name}` : name,
+      description,
+      default: defaultValue,
+    };
+  });
 }
 
 export const rnxTestCommand = {

package/test/test.test.ts

@@ -0,0 +1,17 @@
+import { jestOptions, resolveJestCli } from "../src/test";
+
+describe("rnx-test", () => {
+  test("retrieves options from 'jest-cli'", () => {
+    const options = jestOptions();
+    expect(options.length).toBeGreaterThan(1);
+
+    const updateSnapshot = options.find(({ name }) => name.startsWith("-u,"));
+    expect(updateSnapshot).toBeDefined();
+  });
+
+  test("resolves 'jest-cli' starting from 'jest'", () => {
+    expect(resolveJestCli()).toMatch(
+      /node_modules[/\\]jest-cli[/\\]build[/\\]index.js$/
+    );
+  });
+});