Skip to content

fix: RNGP CCache compatibility #54829

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
tjzel wants to merge 3 commits into from
Closed

fix: RNGP CCache compatibility #54829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eda3aad
fix: RNGP CCache compatibility
tjzel Dec 5, 2025
ad08894
chore: fix tests
tjzel Dec 9, 2025
9a6de42
Merge branch 'main' into @tjzel/rngp-ccache
tjzel Dec 9, 2025
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
21 changes: 12 additions & 9 deletions ...e-plugin/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 @@ -42,6 +42,7 @@ internal fun detectedEntryFile(config: ReactExtension, envVariableOverride: Stri
*/
internal fun detectedCliFile(config: ReactExtension): File =
detectCliFile(
project = config.project,
reactNativeRoot = config.root.get().asFile,
preconfiguredCliFile = config.cliFile.asFile.orNull,
)
Expand Down Expand Up @@ -71,7 +72,11 @@ private fun detectEntryFile(
else -> File(reactRoot, "index.js")
}

private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): File {
private fun detectCliFile(
project: Project,
reactNativeRoot: File,
preconfiguredCliFile: File?
): File {
// 1. preconfigured path
if (preconfiguredCliFile != null) {
if (preconfiguredCliFile.exists()) {
Expand All @@ -81,14 +86,12 @@ private fun detectCliFile(reactNativeRoot: File, preconfiguredCliFile: File?): F

// 2. node module path
val nodeProcess =
Runtime.getRuntime()
.exec(
arrayOf("node", "--print", "require.resolve('react-native/cli');"),
emptyArray(),
reactNativeRoot,
)

val nodeProcessOutput = nodeProcess.inputStream.use { it.bufferedReader().readText().trim() }
project.providers.exec {
it.commandLine("node", "--print", "require.resolve('react-native/cli');")
it.workingDir(reactNativeRoot)
}

val nodeProcessOutput = nodeProcess.standardOutput.asText.get().trim()

if (nodeProcessOutput.isNotEmpty()) {
val nodeModuleCliJs = File(nodeProcessOutput)
Expand Down
3 changes: 2 additions & 1 deletion ...ugin/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/PathUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.facebook.react.tests.WithOs
import java.io.File
import org.assertj.core.api.Assertions.assertThat
import org.gradle.testfixtures.ProjectBuilder
import org.gradle.process.ProcessExecutionException
import org.junit.Assume.assumeTrue
import org.junit.Rule
import org.junit.Test
Expand Down Expand Up @@ -99,7 +100,7 @@ class PathUtilsTest {
assertThat(actual.readText()).isEqualTo("<!-- nothing to see here -->")
}

@Test(expected = IllegalStateException::class)
@Test(expected = ProcessExecutionException::class)
fun detectedCliPath_failsIfNotFound() {
val project = ProjectBuilder.builder().build()
val extension = TestReactExtension(project)
Expand Down
Loading