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
26 changes: 17 additions & 9 deletions ios/features.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -60,16 +60,24 @@ export function isBridgelessEnabled(reactNativeVersion, options) {
* @returns {boolean | "from-source"}
*/
export function isHermesEnabled(platform, reactNativeVersion, options) {
const useHermes = process.env["USE_HERMES"];
const enabled =
typeof useHermes === "string"
? useHermes === "1"
: options["hermesEnabled"] === true;
if (reactNativeVersion < v(0, 80, 0)) {
const useHermes = process.env["USE_HERMES"];
const enabled =
typeof useHermes === "string"
? useHermes === "1"
: options["hermesEnabled"] === true;

// Hermes prebuilds for visionOS was introduced in 0.76
if (enabled && platform === "visionos" && reactNativeVersion < v(0, 76, 0)) {
return "from-source";
// Hermes prebuilds for visionOS was introduced in 0.76
if (
enabled &&
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be better to centralize these types of settings into capabilities. Maybe a function that returns an object with various capabilities given a RN version and process.env settings. It ends up being easier to manage. Doesn't need to be done now but something for you to consider.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

platform === "visionos" &&
reactNativeVersion < v(0, 76, 0)
) {
return "from-source";
}

return enabled;
}

return enabled;
return true;
}
14 changes: 7 additions & 7 deletions test/ios/app.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: true,
useHermes: false,
useHermes: true,
useNewArch: true,
xcodeprojPath: "/~/node_modules/.generated/ios/ReactTestApp.xcodeproj",
},
Expand Down Expand Up @@ -297,7 +297,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: true,
useHermes: false,
useHermes: true,
useNewArch: true,
xcodeprojPath: "/~/node_modules/.generated/ios/ReactTestApp.xcodeproj",
},
Expand Down Expand Up @@ -362,7 +362,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: true,
useHermes: false,
useHermes: true,
useNewArch: true,
xcodeprojPath:
"/~/node_modules/.generated/macos/ReactTestApp.xcodeproj",
Expand Down Expand Up @@ -428,7 +428,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: true,
useHermes: false,
useHermes: true,
useNewArch: true,
xcodeprojPath:
"/~/node_modules/.generated/visionos/ReactTestApp.xcodeproj",
Expand Down Expand Up @@ -490,7 +490,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: false,
useHermes: false,
useHermes: true,
useNewArch: false,
xcodeprojPath: "/~/node_modules/.generated/ios/ReactTestApp.xcodeproj",
},
Expand Down Expand Up @@ -549,7 +549,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: false,
useHermes: false,
useHermes: true,
useNewArch: false,
xcodeprojPath:
"/~/node_modules/.generated/macos/ReactTestApp.xcodeproj",
Expand Down Expand Up @@ -609,7 +609,7 @@ const PROJECT_FILES = {
testsBuildSettings: {},
uitestsBuildSettings: {},
useBridgeless: false,
useHermes: false,
useHermes: true,
useNewArch: false,
xcodeprojPath:
"/~/node_modules/.generated/visionos/ReactTestApp.xcodeproj",
Expand Down
26 changes: 17 additions & 9 deletions test/ios/features.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,39 @@ describe("isBridgelessEnabled()", () => {
});

describe("isHermesEnabled()", () => {
before(() => {
function resetEnvironmentVariables() {
delete process.env["USE_HERMES"];
});
}

afterEach(() => {
delete process.env["USE_HERMES"];
});
before(resetEnvironmentVariables);

afterEach(resetEnvironmentVariables);

for (const platform of ["ios", "macos", "visionos"] as const) {
it(`[${platform}] is disabled by default`, () => {
ok(!isHermesEnabled(platform, v(1, 0, 0), {}));
ok(!isHermesEnabled(platform, v(0, 79, 0), {}));
});

it(`[${platform}] returns true when enabled`, () => {
ok(isHermesEnabled(platform, v(1, 0, 0), { hermesEnabled: true }));
ok(isHermesEnabled(platform, v(0, 79, 0), { hermesEnabled: true }));
});

it(`[${platform}] returns true if 'USE_HERMES=1'`, () => {
process.env["USE_HERMES"] = "1";
ok(isHermesEnabled(platform, v(1, 0, 0), {}));
ok(isHermesEnabled(platform, v(0, 79, 0), {}));
});

it(`[${platform}] returns false if 'USE_HERMES=0'`, () => {
process.env["USE_HERMES"] = "0";
ok(!isHermesEnabled(platform, v(1, 0, 0), { hermesEnabled: true }));
ok(!isHermesEnabled(platform, v(0, 79, 0), { hermesEnabled: true }));
});

it(`[${platform}] always returns true from 0.80 on`, () => {
ok(isHermesEnabled(platform, v(0, 80, 0), {}));

process.env["USE_HERMES"] = "0";

ok(isHermesEnabled(platform, v(0, 80, 0), {}));
});
}

Expand Down
Loading