Skip to content

fix: resolve CLI through react-native to avoid hoisting issues #973

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 2 commits into from
Feb 14, 2020
Merged

fix: resolve CLI through react-native to avoid hoisting issues #973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7895df
fix: resolve CLI through react-native to avoid hoisting issues
thymikee Feb 14, 2020
5b04495
fix tests
thymikee Feb 14, 2020
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
2 changes: 1 addition & 1 deletion packages/platform-android/native_modules.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ class ReactNativeModules {
*
* @todo: `fastlane` has been reported to not work too.
*/
def cliResolveScript = "console.log(require('@react-native-community/cli').bin);"
def cliResolveScript = "console.log(require('react-native/cli').bin);"
String[] nodeCommand = ["node", "-e", cliResolveScript]
def cliPath = this.getCommandOutput(nodeCommand)

Expand Down
3 changes: 2 additions & 1 deletion packages/platform-ios/native_modules.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ def use_native_modules!(config = nil)
config = nil;
end

cli_resolve_script = "console.log(require('@react-native-community/cli').bin);"
# Resolving the path the RN CLI. The `@react-native-community/cli` module may not be there for certain package managers, so we fall back to resolving it through `react-native` package, that's always present in RN projects
cli_resolve_script = "try {console.log(require('@react-native-community/cli').bin);} catch (e) {console.log(require('react-native/cli').bin);}"
Copy link
Member Author

@thymikee thymikee Feb 14, 2020

Choose a reason for hiding this comment

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

cc @alloy in reality this try/catch is only necessary for testing environment. Do you think it's better to leave this or somehow detect we're in "test" environment and change path accordingly? (usually a bad idea in my experience)

Copy link
Member

@alloy alloy Feb 14, 2020

Choose a reason for hiding this comment

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

Might be better to mock execute_command instead?

cli_bin = Pod::Executable.execute_command("node", ["-e", cli_resolve_script], true).strip

if (!config)
Expand Down