Skip to content

fix hermes path in case of single platform only #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
revopushbot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix hermes path in case of single platform only #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 22 additions & 15 deletions script/react-native-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,23 +245,24 @@ export async function getMinifyParams(command: cli.IReleaseReactCommand) {
}

export async function isHermesEnabled(command: cli.IReleaseReactCommand, platform: string = command.platform.toLowerCase()) {
// Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in Podfile and we're releasing an iOS build
const isAndroidHermesEnabled = await getAndroidHermesEnabled(command.gradleFile);
const isIOSHermesEnabled = getiOSHermesEnabled(command.podFile);

return command.useHermes || (platform === "android" && isAndroidHermesEnabled) || (platform === "ios" && isIOSHermesEnabled);
if (command.useHermes) return true;
if (platform === "android") return getAndroidHermesEnabled(command.gradleFile);
if (platform === "ios") return getiOSHermesEnabled(command.podFile);
return false;
}

function parseBuildGradleFile(gradleFile: string) {
let buildGradlePath: string = path.join("android", "app");
if (gradleFile) {
buildGradlePath = gradleFile;
}
if (fs.lstatSync(buildGradlePath).isDirectory()) {
buildGradlePath = path.join(buildGradlePath, "build.gradle");
}

if (fileDoesNotExistOrIsDirectory(buildGradlePath)) {
try {
if (fs.lstatSync(buildGradlePath).isDirectory()) {
buildGradlePath = path.join(buildGradlePath, "build.gradle");
fs.accessSync(buildGradlePath);
}
} catch {
throw new Error(`Unable to find gradle file "${buildGradlePath}".`);
}

Expand Down Expand Up @@ -345,12 +346,13 @@ async function getAndroidHermesEnabled(gradleFile: string): Promise<boolean> {
}

function getiOSHermesEnabled(podFile: string): boolean {
let podPath = path.join("ios", "Podfile");
if (podFile) {
podPath = podFile;
}
if (fileDoesNotExistOrIsDirectory(podPath)) {
const podPath = podFile || path.join("ios", "Podfile");
if (podFile && fileDoesNotExistOrIsDirectory(podPath)) {
throw new Error(`Unable to find Podfile file "${podPath}".`);
} else if (!podFile && fileDoesNotExistOrIsDirectory(podPath)) {
// No Podfile at default path (e.g. Android-only project); fall back to RN version heuristic
const rnVersion = coerce(getReactNativeVersion())?.version;
return !!(rnVersion && compare(rnVersion, "0.70.0") >= 0);
}

try {
Expand Down Expand Up @@ -422,7 +424,12 @@ async function getHermesCommand(gradleFile: string): Promise<string> {
return bundledHermesEngine;
}

const gradleHermesCommand = await getHermesCommandFromGradle(gradleFile);
let gradleHermesCommand = "";
try {
gradleHermesCommand = await getHermesCommandFromGradle(gradleFile);
} catch {
// Gradle files not present (e.g. iOS-only project); skip to node_modules fallback
}
if (gradleHermesCommand) {
return path.join("android", "app", gradleHermesCommand.replace("%OS-BIN%", getHermesOSBin()));
} else {
Expand Down