Skip to content

fix: do not throw on missing cliPath, use the default value #28625

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

Closed
grabbou wants to merge 5 commits into from
Closed

fix: do not throw on missing cliPath, use the default value #28625

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef9ef01
Update react.gradle
grabbou Apr 14, 2020
8f28ec7
add auto resolution
grabbou Apr 14, 2020
1b5d53a
tweaks
grabbou Apr 14, 2020
b8bd74a
simplify logic
grabbou Apr 14, 2020
815d6fe
use correct path
grabbou Apr 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
9 changes: 4 additions & 5 deletions react.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def detectEntryFile(config) {
return "index.js";
}

def cliPath = config.cliPath ?: "node_modules/react-native/cli.js"
def defaultCliPath = "node_modules/react-native/cli.js"
def composeSourceMapsPath = config.composeSourceMapsPath ?: "node_modules/react-native/scripts/compose-source-maps.js"
def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
def entryFile = detectEntryFile(config)
Expand Down Expand Up @@ -104,13 +104,12 @@ afterEvaluate {

if (config.cliPath || config.nodeExecutableAndArgs) {
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
execCommand.addAll(["cmd", "/c", *nodeExecutableAndArgs, cliPath])
execCommand.addAll(["cmd", "/c", *nodeExecutableAndArgs, config.cliPath])
} else {
execCommand.addAll([*nodeExecutableAndArgs, cliPath])
execCommand.addAll([*nodeExecutableAndArgs, config.cliPath])
}
} else {
throw new Exception("Missing cliPath or nodeExecutableAndArgs from build config. " +
"Please set project.ext.react.cliPath to the path of the react-native cli.js");
execCommand.add(defaultCliPath)
Comment thread
grabbou marked this conversation as resolved.
Outdated
}

def enableHermes = enableHermesForVariant(variant)
Expand Down