Skip to content

Commit de07231

Browse files
tido64kelset
andauthored
fix(visionos): declare support for 0.74 (#1933)
* fix(visionos): declare support for 0.74 * fixup! fix(visionos): declare support for 0.74 * fix: remove --no-packager as it is currently broken --------- Co-authored-by: Lorenzo Sciandra <[email protected]>
1 parent 0c31391 commit de07231

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

example/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"macos": "react-native run-macos --no-packager --scheme Example",
1616
"set-react-version": "yarn workspace react-native-test-app set-react-version",
1717
"start": "react-native start",
18+
"visionos": "react-native run-visionos",
1819
"windows": "react-native run-windows --no-packager"
1920
},
2021
"dependencies": {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"yoctocolors": "^2.0.0"
9696
},
9797
"peerDependencies": {
98-
"@callstack/react-native-visionos": "0.73",
98+
"@callstack/react-native-visionos": "0.73 - 0.74",
9999
"@expo/config-plugins": ">=5.0",
100100
"react": "17.0.1 - 18.2",
101101
"react-native": "0.66 - 0.74 || >=0.75.0-0 <0.75.0",

scripts/set-react-version.mjs

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -348,22 +348,35 @@ async function getProfile(v, coreOnly) {
348348
}
349349

350350
default: {
351-
const [reactNative, { version: rnmVersion }, { version: rnwVersion }] =
352-
await Promise.all([
353-
fetchPackageInfo(`react-native@^${v}.0-0`),
354-
coreOnly
355-
? Promise.resolve({ version: undefined })
356-
: fetchPackageInfo(`react-native-macos@^${v}.0-0`),
357-
coreOnly
358-
? Promise.resolve({ version: undefined })
359-
: fetchPackageInfo(`react-native-windows@^${v}.0-0`),
360-
]);
351+
const manifest = /** @type {Manifest} */ (readJSONFile("package.json"));
352+
const visionos = manifest.defaultPlatformPackages?.["visionos"];
353+
if (!visionos) {
354+
throw new Error("Missing platform package for visionOS");
355+
}
356+
357+
const versions = {
358+
core: fetchPackageInfo(`react-native@^${v}.0-0`),
359+
macos: coreOnly
360+
? Promise.resolve({ version: undefined })
361+
: fetchPackageInfo(`react-native-macos@^${v}.0-0`),
362+
visionos: coreOnly
363+
? Promise.resolve({ version: undefined })
364+
: fetchPackageInfo(`${visionos}@^${v}.0-0`),
365+
windows: coreOnly
366+
? Promise.resolve({ version: undefined })
367+
: fetchPackageInfo(`react-native-windows@^${v}.0-0`),
368+
};
369+
const reactNative = await versions.core;
361370
const commonDeps = await resolveCommonDependencies(v, reactNative);
371+
372+
/** @type {(manifest: Manifest) => string | undefined} */
373+
const getVersion = ({ version }) => version;
362374
return {
363375
...commonDeps,
364376
"react-native": reactNative.version,
365-
"react-native-macos": rnmVersion,
366-
"react-native-windows": rnwVersion,
377+
"react-native-macos": await versions.macos.then(getVersion),
378+
"react-native-windows": await versions.windows.then(getVersion),
379+
[visionos]: await versions.visionos.then(getVersion),
367380
};
368381
}
369382
}

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12276,7 +12276,7 @@ __metadata:
1227612276
uuid: "npm:^9.0.0"
1227712277
yoctocolors: "npm:^2.0.0"
1227812278
peerDependencies:
12279-
"@callstack/react-native-visionos": 0.73
12279+
"@callstack/react-native-visionos": 0.73 - 0.74
1228012280
"@expo/config-plugins": ">=5.0"
1228112281
react: 17.0.1 - 18.2
1228212282
react-native: 0.66 - 0.74 || >=0.75.0-0 <0.75.0

0 commit comments

Comments
 (0)