Skip to content

Commit c26428b

Browse files
authored
chore: reformat Hermes version string to fix layout issues (#2550)
1 parent 97847ff commit c26428b

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

example/src/core.ts

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ export type ReactNativeVersion = {
1212
export const ReactNativeVersion: ReactNativeVersion = (() => {
1313
// https://github.com/facebook/react-native/commit/ec5638abd0e872be62b6ea5d8df9bed6335c2191
1414
const { ReactNativeVersion } = require("react-native");
15-
if (ReactNativeVersion) {
16-
return ReactNativeVersion;
17-
}
18-
19-
const { version } = require("react-native/Libraries/Core/ReactNativeVersion");
15+
const { major, minor, patch, prerelease } =
16+
ReactNativeVersion ??
17+
require("react-native/Libraries/Core/ReactNativeVersion").version;
2018
return {
21-
...version,
19+
major,
20+
minor,
21+
patch,
22+
prerelease,
2223
getVersionString: () => {
23-
const { major, minor, patch, prerelease } = version;
2424
const v = `${major}.${minor}.${patch}`;
2525
return prerelease ? `${v}-${prerelease.replace("-", "\n")}` : v;
2626
},
@@ -38,11 +38,19 @@ export function getHermesVersion(): string | undefined {
3838
return undefined;
3939
}
4040

41-
return `Hermes ${version}`;
41+
const [core, prerelease, ...build] = version.split("-");
42+
const parts = [core];
43+
if (prerelease) {
44+
parts.push("-", prerelease);
45+
if (build.length > 0) {
46+
parts.push("\n", build.join("-"));
47+
}
48+
}
49+
return `Hermes ${parts.join("")}`;
4250
}
4351

4452
export function isBridgeless() {
45-
return "RN$Bridgeless" in global && RN$Bridgeless === true;
53+
return "RN$Bridgeless" in global && global.RN$Bridgeless === true;
4654
}
4755

4856
export function isConcurrentReactEnabled(

0 commit comments

Comments
 (0)