Skip to content

Commit af41f59

Browse files
committed
fixup! chore: fix nightlies failing to build react-native-safe-area-context
1 parent 3eedb14 commit af41f59

4 files changed

Lines changed: 16 additions & 12 deletions

File tree

.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33
*.pbxproj -text
44
*.sh text eol=lf
55
/.yarn/releases/* binary
6+
7+
# Generated files
8+
packages/app/android/app/src/main/java/com/microsoft/reacttestapp/manifest/Manifest.kt text eol=lf
9+
packages/app/ios/ReactTestApp/Manifest.swift text eol=lf
10+
packages/app/schema.json text eol=lf
11+
packages/app/windows/Shared/Manifest.h text eol=lf

packages/app/example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@react-native/babel-preset": "^0.85.0",
3434
"@react-native/metro-config": "^0.85.0",
3535
"@rnx-kit/cli": "catalog:",
36-
"@rnx-kit/metro-config": "^2.2.4",
36+
"@rnx-kit/metro-config": "catalog:",
3737
"@rnx-kit/polyfills": "catalog:",
3838
"@rnx-kit/tsconfig": "catalog:",
3939
"@types/react": "~19.2.0",

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
11
import { deepEqual } from "node:assert/strict";
2+
import { spawnSync } from "node:child_process";
23
import { afterEach, describe, it } from "node:test";
3-
import { URL } from "node:url";
44
import { updatePackageManifest as updatePackageManifestActual } from "../../scripts/configure.mjs";
5-
import { readJSONFile } from "../../scripts/helpers.js";
6-
import type { Manifest } from "../../scripts/types.ts";
75
import { fs, setMockFiles } from "../fs.mock.mts";
86

9-
function getExampleManifest() {
10-
const p = new URL("../../example/package.json", import.meta.url);
11-
const manifest = readJSONFile<Manifest>(p);
12-
return manifest;
7+
function getCatalog(): Record<string, string> {
8+
const { stdout } = spawnSync("yarn", ["config", "get", "catalog", "--json"], {
9+
shell: process.platform === "win32",
10+
});
11+
return JSON.parse(stdout.toString().trim());
1312
}
1413

1514
describe("updatePackageManifest()", () => {
1615
const updatePackageManifest: typeof updatePackageManifestActual = (p, cfg) =>
1716
updatePackageManifestActual(p, cfg, fs);
1817

19-
const exampleManifest = getExampleManifest();
18+
const catalog = getCatalog();
2019
const devDependencies = {
21-
"@rnx-kit/metro-config":
22-
exampleManifest["devDependencies"]?.["@rnx-kit/metro-config"],
20+
"@rnx-kit/metro-config": catalog["@rnx-kit/metro-config"],
2321
"react-native-test-app": "^0.0.1-dev",
2422
};
2523

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8336,7 +8336,7 @@ __metadata:
83368336
"@react-native/babel-preset": "npm:^0.85.0"
83378337
"@react-native/metro-config": "npm:^0.85.0"
83388338
"@rnx-kit/cli": "catalog:"
8339-
"@rnx-kit/metro-config": "npm:^2.2.4"
8339+
"@rnx-kit/metro-config": "catalog:"
83408340
"@rnx-kit/polyfills": "catalog:"
83418341
"@rnx-kit/tsconfig": "catalog:"
83428342
"@types/react": "npm:~19.2.0"

0 commit comments

Comments
 (0)