Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/app/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"build:visionos": "rnx-cli bundle --platform ios",
"build:windows": "rnx-cli bundle --platform windows",
"ci:windows": "rnx-cli run-windows --logging --no-packager --no-launch --no-deploy --msbuildprops UseBundle=false --no-telemetry",
"clean": "yarn workspace react-native-test-app clean",
"ios": "rnx-cli run --platform ios",
"macos": "rnx-cli run --platform macos",
"set-react-version": "yarn workspace react-native-test-app set-react-version",
Expand Down
16 changes: 11 additions & 5 deletions packages/app/scripts/internal/set-react-version.mts
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,12 @@ export async function setReactVersion(
"../../package.json",
];
for (const manifestPath of manifests) {
if (!fs.existsSync(manifestPath)) {
continue;
}

const manifest = readJSONFile<Manifest>(manifestPath);
const { dependencies, devDependencies, resolutions } = manifest;
const { dependencies = {}, devDependencies = {}, resolutions } = manifest;
if (!devDependencies) {
throw new Error("Expected 'devDependencies' to be declared");
}
Expand All @@ -311,10 +315,12 @@ export async function setReactVersion(
}
} else {
for (const packageName of keys(profile)) {
const deps = dependencies?.[packageName]
? dependencies
: devDependencies;
deps[packageName] = profile[packageName];
if (Object.hasOwn(dependencies, packageName)) {
dependencies[packageName] = profile[packageName];
}
if (Object.hasOwn(devDependencies, packageName)) {
devDependencies[packageName] = profile[packageName];
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/app/scripts/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ export type Manifest = {
url: string;
directory?: string;
};
dependencies?: Record<string, string>;
dependencies?: Record<string, string | undefined>;
peerDependencies?: Record<string, string>;
devDependencies?: Record<string, string | undefined>;
resolutions?: Record<string, string | undefined>;
Expand Down
3 changes: 1 addition & 2 deletions packages/example-macos/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
"build:ios": "rnx-cli bundle --platform ios",
"build:macos": "rnx-cli bundle --platform macos",
"build:visionos": "rnx-cli bundle --platform ios",
"clean": "yarn workspace react-native-test-app clean",
"ios": "rnx-cli run --platform ios",
"macos": "rnx-cli run --platform macos",
"set-react-version": "yarn workspace react-native-test-app set-react-version",
"set-react-version": "node ../app/scripts/internal/set-react-version.mts",
"start": "rnx-cli start",
"visionos": "rnx-cli run --platform visionos"
},
Expand Down
3 changes: 1 addition & 2 deletions packages/example-windows/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
"build:ios": "rnx-cli bundle --platform ios",
"build:windows": "rnx-cli bundle --platform windows",
"ci:windows": "rnx-cli run-windows --logging --no-packager --no-launch --no-deploy --msbuildprops UseBundle=false --no-telemetry",
"clean": "yarn workspace react-native-test-app clean",
"ios": "rnx-cli run --platform ios",
"prebuild": "node ../app/windows/app.mjs",
"set-react-version": "yarn workspace react-native-test-app set-react-version",
"set-react-version": "node ../app/scripts/internal/set-react-version.mts",
"start": "rnx-cli start",
"windows": "rnx-cli run-windows --no-packager"
},
Expand Down
Loading