Skip to content

fix(rn): Remove hermesc envs if hermes is disabled #1754

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

Merged
merged 5 commits into from
Sep 26, 2023
Merged

fix(rn): Remove hermesc envs if hermes is disabled #1754

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebb87e5
fix(rn): Remove hermesc envs if hermes is disabled
krystofwoldrich Sep 22, 2023
1f1a90d
Merge remote-tracking branch 'origin/master' into kw-fix-hermesc-auto…
krystofwoldrich Sep 22, 2023
2805878
Remove unused import
krystofwoldrich Sep 22, 2023
7f72be6
Remove unnecessary line
krystofwoldrich Sep 25, 2023
eccc948
Formatting
loewenheim Sep 25, 2023
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: 21 additions & 5 deletions src/commands/react_native/xcode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::collections::HashMap;
use std::env;
use std::fs;
use std::path::Path;
use std::path::PathBuf;
use std::process;

Expand Down Expand Up @@ -146,6 +147,13 @@ fn find_hermesc() -> String {
format!("{}/hermes-engine/destroot/bin/hermesc", pods_root_path)
}

/// Check if Hermes is enabled based its executable existence in the installed pods
/// The same as RN Tooling does it https://github.com/facebook/react-native/blob/435245978122d34a78014600562517c3bf96f92e/scripts/react-native-xcode.sh#L98C11-L98C11
/// We ignore `USE_HERMES` as its behavior is not consistent between 0.65 - 0.72 and it the later versions it was removed as user override.
fn is_hermes_enabled(hermesc: &String) -> bool {
return Path::new(hermesc).exists();
}

pub fn execute(matches: &ArgMatches) -> Result<()> {
let config = Config::current();
let (org, project) = config.get_org_and_project(matches)?;
Expand Down Expand Up @@ -263,16 +271,24 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
// With that we we then have all the information we need to invoke the
// upload process.
} else {
let rv = process::Command::new(&script)
let mut command= process::Command::new(&script);
Copy link
Contributor

@loewenheim loewenheim Sep 25, 2023

Choose a reason for hiding this comment

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

Please run cargo fmt on the project as well.

Copy link
Contributor Author

@krystofwoldrich krystofwoldrich Sep 25, 2023

Choose a reason for hiding this comment

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

I did, but no changes emitted.

I fixed one extra empty line manually.

Copy link
Contributor

@loewenheim loewenheim Sep 25, 2023

Choose a reason for hiding this comment

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

Hm, that's odd. It doesn't do anything for me either, but my editor formats this correctly. Do you mind if I push my formatting changes?

Copy link
Contributor Author

@krystofwoldrich krystofwoldrich Sep 25, 2023

Choose a reason for hiding this comment

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

I don't mind. Go ahead.

command
.env("NODE_BINARY", env::current_exe()?.to_str().unwrap())
.env("SENTRY_RN_REAL_NODE_BINARY", &node)
.env("HERMES_CLI_PATH", env::current_exe()?.to_str().unwrap())
.env("SENTRY_RN_REAL_HERMES_CLI_PATH", &hermesc)

.env(
"SENTRY_RN_SOURCEMAP_REPORT",
report_file.path().to_str().unwrap(),
)
.env("__SENTRY_RN_WRAP_XCODE_CALL", "1")
.env("__SENTRY_RN_WRAP_XCODE_CALL", "1");

if is_hermes_enabled(&hermesc) {
command
.env("HERMES_CLI_PATH", env::current_exe()?.to_str().unwrap())
.env("SENTRY_RN_REAL_HERMES_CLI_PATH", &hermesc);
}

let rv = command
.spawn()?
.wait()?;
propagate_exit_status(rv);
Expand Down Expand Up @@ -307,7 +323,7 @@ pub fn execute(matches: &ArgMatches) -> Result<()> {
} else {
bundle_path = packager_bundle_path;
sourcemap_path = packager_sourcemap_path;
println!("Using React Native Packager bundle and combined source map.");
println!("Using React Native Packager bundle and source map.");
}
bundle_url = format!("~/{}", bundle_path.file_name().unwrap().to_string_lossy());
sourcemap_url = format!(
Expand Down