Skip to content

Backport the cliPath fix to the Gradle Plugin #32193

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
cortinico wants to merge 1 commit into from
Closed

Backport the cliPath fix to the Gradle Plugin #32193

Show file tree
Hide file tree
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
14 changes: 11 additions & 3 deletions packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ internal fun detectedCliPath(
config: ReactAppExtension,
): String =
detectCliPath(
projectDir = projectDir, reactRoot = config.reactRoot, preconfuredCliPath = config.cliPath)
projectDir = projectDir,
reactRoot = config.reactRoot,
preconfiguredCliPath = config.cliPath)

/**
* Computes the `hermesc` command location. The Algo follows this order:
Expand All @@ -55,9 +57,15 @@ private fun detectEntryFile(entryFile: File?, reactRoot: File): File =
else -> File(reactRoot, "index.js")
}

private fun detectCliPath(projectDir: File, reactRoot: File, preconfuredCliPath: String?): String {
private fun detectCliPath(
projectDir: File,
reactRoot: File,
preconfiguredCliPath: String?
): String {
// 1. preconfigured path
if (preconfuredCliPath != null) return preconfuredCliPath
if (preconfiguredCliPath != null) {
return File(projectDir, preconfiguredCliPath).toString()
}

// 2. node module path
val nodeProcess =
Expand Down
19 changes: 16 additions & 3 deletions ...ages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/tests/PathUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,25 @@ class PathUtilsTest {
fun detectedCliPath_withCliPathFromExtension() {
val project = ProjectBuilder.builder().build()
val extension = ReactAppExtension(project)
val expected = tempFolder.newFile("fake-cli.sh")
extension.cliPath = expected.toString()
val expected = File(project.projectDir, "fake-cli.sh").apply { writeText("#!/bin/bash") }
extension.cliPath = "./fake-cli.sh"

val actual = detectedCliPath(project.projectDir, extension)

assertEquals(expected.toString(), actual)
assertEquals(expected.canonicalPath, File(actual).canonicalPath)
}

@Test
fun detectedCliPath_withCliPathFromExtensionInParentFolder() {
val rootProject = ProjectBuilder.builder().build()
val project = ProjectBuilder.builder().withParent(rootProject).build()
val extension = ReactAppExtension(project)
val expected = File(rootProject.projectDir, "cli-in-root.sh").apply { writeText("#!/bin/bash") }
extension.cliPath = "../cli-in-root.sh"

val actual = detectedCliPath(project.projectDir, extension)

assertEquals(expected.canonicalPath, File(actual).canonicalPath)
}

@Test
Expand Down