chore: fix nightlies failing to build react-native-safe-area-context

.gitattributes

@@ -3,3 +3,9 @@
 *.pbxproj          -text
 *.sh               text eol=lf
 /.yarn/releases/*  binary
+
+# Generated files
+packages/app/android/app/src/main/java/com/microsoft/reacttestapp/manifest/Manifest.kt  text eol=lf
+packages/app/ios/ReactTestApp/Manifest.swift                                            text eol=lf
+packages/app/schema.json                                                                text eol=lf
+packages/app/windows/Shared/Manifest.h                                                  text eol=lf

.yarnrc.yml

@@ -1,9 +1,10 @@
 catalog:
   "@babel/core": ^7.25.2
   "@babel/preset-env": ^7.25.3
-  "@rnx-kit/cli": ^1.0.0
-  "@rnx-kit/metro-config": ^2.2.3
-  "@rnx-kit/polyfills": ^0.2.0
+  "@react-native-webapis/web-storage": ^0.4.5
+  "@rnx-kit/cli": ^2.0.1
+  "@rnx-kit/metro-config": ^2.2.4
+  "@rnx-kit/polyfills": ^0.3.0
   "@rnx-kit/tsconfig": ^3.0.1
 compressionLevel: 0
 enableGlobalCache: false

package.json

@@ -30,8 +30,8 @@
   },
   "devDependencies": {
     "@nx/js": "^22.0.0",
-    "@rnx-kit/align-deps": "^3.4.5",
-    "@rnx-kit/lint-lockfile": "^0.1.0",
+    "@rnx-kit/align-deps": "^4.0.1",
+    "@rnx-kit/lint-lockfile": "^0.2.0",
     "@rnx-kit/oxlint-config": "^1.0.3",
     "@rnx-kit/tools-git": "^0.1.1",
     "@swc-node/register": "^1.11.1",

packages/app/example/package.json

@@ -19,7 +19,7 @@
     "windows": "rnx-cli run-windows --no-packager"
   },
   "dependencies": {
-    "@react-native-webapis/web-storage": "^0.4.5",
+    "@react-native-webapis/web-storage": "catalog:",
     "react": "19.2.3",
     "react-native": "^0.85.0",
     "react-native-safe-area-context": "^5.6.0"
@@ -32,10 +32,10 @@
     "@react-native-community/cli-platform-ios": "^20.1.0",
     "@react-native/babel-preset": "^0.85.0",
     "@react-native/metro-config": "^0.85.0",
-    "@rnx-kit/cli": "^1.0.0",
-    "@rnx-kit/metro-config": "^2.2.3",
-    "@rnx-kit/polyfills": "^0.2.0",
-    "@rnx-kit/tsconfig": "^3.0.1",
+    "@rnx-kit/cli": "catalog:",
+    "@rnx-kit/metro-config": "catalog:",
+    "@rnx-kit/polyfills": "catalog:",
+    "@rnx-kit/tsconfig": "catalog:",
     "@types/react": "~19.2.0",
     "@wdio/types": "^9.20.0",
     "appium": "^3.1.1",

packages/app/package.json

@@ -101,7 +101,6 @@
     "@react-native-community/cli": "^20.1.0",
     "@react-native-community/cli-types": "^20.1.0",
     "@react-native-community/template": "^0.85.0",
-    "@rnx-kit/lint-lockfile": "^0.1.0",
     "@rnx-kit/tsconfig": "^3.0.1",
     "@types/js-yaml": "^4.0.5",
     "@types/mustache": "^4.0.0",

packages/app/scripts/configure.mjs

@@ -570,7 +570,7 @@ export function updatePackageManifest(
 
   const { name: rntaName, version: rntaVersion } = readManifest();
   manifest["devDependencies"] = mergeObjects(manifest["devDependencies"], {
-    "@rnx-kit/metro-config": "^2.2.3",
+    "@rnx-kit/metro-config": "^2.2.4",
     [rntaName]: `^${rntaVersion}`,
   });
 

packages/app/test/configure/updatePackageManifest.test.mts

@@ -1,25 +1,23 @@
 import { deepEqual } from "node:assert/strict";
+import { spawnSync } from "node:child_process";
 import { afterEach, describe, it } from "node:test";
-import { URL } from "node:url";
 import { updatePackageManifest as updatePackageManifestActual } from "../../scripts/configure.mjs";
-import { readJSONFile } from "../../scripts/helpers.js";
-import type { Manifest } from "../../scripts/types.ts";
 import { fs, setMockFiles } from "../fs.mock.mts";
 
-function getExampleManifest() {
-  const p = new URL("../../example/package.json", import.meta.url);
-  const manifest = readJSONFile<Manifest>(p);
-  return manifest;
+function getCatalog(): Record<string, string> {
+  const { stdout } = spawnSync("yarn", ["config", "get", "catalog", "--json"], {
+    shell: process.platform === "win32",
+  });
+  return JSON.parse(stdout.toString().trim());
 }
 
 describe("updatePackageManifest()", () => {
   const updatePackageManifest: typeof updatePackageManifestActual = (p, cfg) =>
     updatePackageManifestActual(p, cfg, fs);
 
-  const exampleManifest = getExampleManifest();
+  const catalog = getCatalog();
   const devDependencies = {
-    "@rnx-kit/metro-config":
-      exampleManifest["devDependencies"]?.["@rnx-kit/metro-config"],
+    "@rnx-kit/metro-config": catalog["@rnx-kit/metro-config"],
     "react-native-test-app": "^0.0.1-dev",
   };
 

packages/example-macos/package.json

@@ -16,7 +16,7 @@
     "visionos": "rnx-cli run --platform visionos"
   },
   "dependencies": {
-    "@react-native-webapis/web-storage": "^0.4.5",
+    "@react-native-webapis/web-storage": "catalog:",
     "react": "19.1.4",
     "react-native": "^0.81.6",
     "react-native-macos": "^0.81.0",

packages/example-windows/package.json

@@ -15,7 +15,7 @@
     "windows": "rnx-cli run-windows --no-packager"
   },
   "dependencies": {
-    "@react-native-webapis/web-storage": "^0.4.5",
+    "@react-native-webapis/web-storage": "catalog:",
     "react": "19.1.1",
     "react-native": "^0.82.0",
     "react-native-safe-area-context": "^5.6.0",