@rnx-kit/cli 0.16.21 → 0.16.23

package/lib/bundle/hermes.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.emitBytecode = void 0;
 const console_1 = require("@rnx-kit/console");
 const package_1 = require("@rnx-kit/tools-node/package");
+const metro_1 = require("@rnx-kit/tools-react-native/metro");
 const child_process_1 = require("child_process");
 const fs = __importStar(require("fs"));
 const os = __importStar(require("os"));
@@ -77,9 +78,6 @@ function getOutput(args) {
     }
     return null;
 }
-function isSourceMapFlag(flag) {
-    return flag === "-source-map" || flag.startsWith("-source-map=");
-}
 function emitBytecode(input, sourcemap, options) {
     var _a;
     const cmd = options.command || findHermesBinary();
@@ -103,15 +101,25 @@ function emitBytecode(input, sourcemap, options) {
         output = input + ".hbc";
         args.push("-out", output);
     }
-    if (sourcemap && !args.some(isSourceMapFlag)) {
-        args.push("-source-map", sourcemap);
-    }
     args.push(input);
     (0, console_1.info)("Emitting bytecode to:", output);
     const result = (0, child_process_1.spawnSync)(cmd, args, { stdio: "inherit" });
     if (result.status !== 0) {
         throw result.error;
     }
+    if (sourcemap && args.includes("-output-source-map")) {
+        const outputMap = output + ".map";
+        (0, console_1.info)(`Combining source maps: ${sourcemap} + ${outputMap}`);
+        const options = { encoding: "utf-8" };
+        const packagerSourcemap = JSON.parse(fs.readFileSync(sourcemap, options));
+        const compilerSourcemap = JSON.parse(fs.readFileSync(outputMap, options));
+        // `composeSourceMaps` was introduced in 0.56 — see
+        // https://github.com/facebook/metro/commit/6017085bdad96ca5cec39d50038eb5622ce1097b
+        // @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));
+    }
 }
 exports.emitBytecode = emitBytecode;
 //# sourceMappingURL=hermes.js.map

package/package.json

@@ -1,9 +1,19 @@
 {
   "name": "@rnx-kit/cli",
-  "version": "0.16.21",
+  "version": "0.16.23",
   "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",
+  "author": {
+    "name": "Microsoft Open Source",
+    "email": "microsoftopensource@users.noreply.github.com"
+  },
+  "files": [
+    "lib/**/*.d.ts",
+    "lib/**/*.js",
+    "react-native.config.js",
+    "src"
+  ],
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "exports": {
@@ -27,7 +37,7 @@
     "test": "rnx-kit-scripts test"
   },
   "dependencies": {
-    "@rnx-kit/align-deps": "^2.2.2",
+    "@rnx-kit/align-deps": "^2.3.3",
     "@rnx-kit/config": "^0.6.6",
     "@rnx-kit/console": "^1.0.11",
     "@rnx-kit/metro-plugin-cyclic-dependencies-detector": "^1.1.1",
@@ -39,7 +49,7 @@
     "@rnx-kit/third-party-notices": "^1.3.4",
     "@rnx-kit/tools-language": "^2.0.0",
     "@rnx-kit/tools-node": "^2.1.1",
-    "@rnx-kit/tools-react-native": "^1.3.4",
+    "@rnx-kit/tools-react-native": "^1.3.5",
     "chalk": "^4.1.0",
     "fs-extra": "^10.0.0",
     "node-fetch": "^2.6.7",
@@ -62,26 +72,27 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/preset-env": "^7.20.0",
-    "@react-native-community/cli-clean": "^11.0.0",
-    "@react-native-community/cli-types": "^11.0.0",
+    "@react-native-community/cli-clean": "^12.3.0",
+    "@react-native-community/cli-types": "^12.3.0",
     "@rnx-kit/eslint-config": "*",
     "@rnx-kit/jest-preset": "*",
     "@rnx-kit/scripts": "*",
+    "@rnx-kit/tsconfig": "*",
     "@types/connect": "^3.4.36",
     "@types/fs-extra": "^9.0.0",
     "@types/jest": "^29.2.1",
     "@types/node": "^20.0.0",
     "@types/node-fetch": "^2.6.5",
     "@types/qrcode": "^1.4.2",
-    "eslint": "^8.23.0",
+    "eslint": "^8.56.0",
     "jest": "^29.2.1",
     "memfs": "^4.0.0",
-    "metro": "^0.76.5",
-    "metro-babel-transformer": "^0.76.8",
-    "metro-config": "^0.76.5",
+    "metro": "^0.80.0",
+    "metro-babel-transformer": "^0.80.0",
+    "metro-config": "^0.80.0",
     "prettier": "^3.0.0",
     "react": "18.2.0",
-    "react-native": "^0.72.0",
+    "react-native": "^0.73.0",
     "type-fest": "^4.0.0",
     "typescript": "^5.0.0"
   },

package/src/bundle/hermes.ts

@@ -1,6 +1,7 @@
 import type { HermesOptions } from "@rnx-kit/config";
 import { error, info } from "@rnx-kit/console";
 import { findPackageDependencyDir } from "@rnx-kit/tools-node/package";
+import { requireModuleFromMetro } from "@rnx-kit/tools-react-native/metro";
 import { spawnSync } from "child_process";
 import * as fs from "fs";
 import * as os from "os";
@@ -57,10 +58,6 @@ function getOutput(args: string[]): string | null {
   return null;
 }
 
-function isSourceMapFlag(flag: string): boolean {
-  return flag === "-source-map" || flag.startsWith("-source-map=");
-}
-
 export function emitBytecode(
   input: string,
   sourcemap: string | undefined,
@@ -90,10 +87,6 @@ export function emitBytecode(
     args.push("-out", output);
   }
 
-  if (sourcemap && !args.some(isSourceMapFlag)) {
-    args.push("-source-map", sourcemap);
-  }
-
   args.push(input);
 
   info("Emitting bytecode to:", output);
@@ -101,4 +94,21 @@ export function emitBytecode(
   if (result.status !== 0) {
     throw result.error;
   }
+
+  if (sourcemap && args.includes("-output-source-map")) {
+    const outputMap = output + ".map";
+    info(`Combining source maps: ${sourcemap} + ${outputMap}`);
+
+    const options = { encoding: "utf-8" } as const;
+    const packagerSourcemap = JSON.parse(fs.readFileSync(sourcemap, options));
+    const compilerSourcemap = JSON.parse(fs.readFileSync(outputMap, options));
+
+    // `composeSourceMaps` was introduced in 0.56 — see
+    // https://github.com/facebook/metro/commit/6017085bdad96ca5cec39d50038eb5622ce1097b
+    // @ts-expect-error Property 'composeSourceMaps' does not exist
+    const { composeSourceMaps } = requireModuleFromMetro("metro-source-map");
+
+    const composed = composeSourceMaps([packagerSourcemap, compilerSourcemap]);
+    fs.writeFileSync(outputMap, JSON.stringify(composed));
+  }
 }