Skip to content

Commit d0d08e4

Browse files
cortinicofacebook-github-bot
authored andcommitted
Runtime check that NewArchitecture is enabled in DefaultNewArchitectureEntryPoint (#53780)
Summary: Pull Request resolved: #53780 This is a commit we're going to pick in 0.82 as we want to make sure users cannot invoke `load()` from `DefaultNewArchitectureEntryPoint` with flags that are not true,true,true. Changelog: [Android] [Changed] - Runtime check that NewArchitecture is enabled in DefaultNewArchitectureEntryPoint Reviewed By: mdvacca Differential Revision: D82456975 fbshipit-source-id: 749996a3491913cfe400173608218077c3ffbc10
1 parent 4858a0f commit d0d08e4

File tree

2 files changed

+38
-20
lines changed

2 files changed

+38
-20
lines changed

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ public object DefaultNewArchitectureEntryPoint {
120120
internal fun loadWithFeatureFlags(featureFlags: ReactNativeFeatureFlagsProvider) {
121121
ReactNativeFeatureFlags.override(featureFlags)
122122

123+
val (isValid, errorMessage) =
124+
isConfigurationValid(turboModulesEnabled, fabricEnabled, bridgelessEnabled)
125+
if (!isValid) {
126+
error(errorMessage)
127+
}
128+
123129
privateFabricEnabled = featureFlags.enableFabricRenderer()
124130
privateTurboModulesEnabled = featureFlags.useTurboModules()
125131
privateConcurrentReactEnabled = featureFlags.enableFabricRenderer()
@@ -158,13 +164,13 @@ public object DefaultNewArchitectureEntryPoint {
158164
fabricEnabled: Boolean,
159165
bridgelessEnabled: Boolean,
160166
): Pair<Boolean, String> =
161-
when {
162-
fabricEnabled && !turboModulesEnabled ->
163-
false to
164-
"fabricEnabled=true requires turboModulesEnabled=true (is now false) - Please update your DefaultNewArchitectureEntryPoint.load() parameters."
165-
bridgelessEnabled && (!turboModulesEnabled || !fabricEnabled) ->
166-
false to
167-
"bridgelessEnabled=true requires (turboModulesEnabled=true AND fabricEnabled=true) - Please update your DefaultNewArchitectureEntryPoint.load() parameters."
168-
else -> true to ""
167+
if (!turboModulesEnabled || !fabricEnabled || !bridgelessEnabled) {
168+
false to
169+
"You cannot load React Native with the New Architecture disabled. " +
170+
"Please use DefaultNewArchitectureEntryPoint.load() instead of " +
171+
"DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=$turboModulesEnabled, " +
172+
"fabricEnabled=$fabricEnabled, bridgelessEnabled=$bridgelessEnabled)"
173+
} else {
174+
true to ""
169175
}
170176
}

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,36 +13,48 @@ import org.junit.Test
1313
class DefaultNewArchitectureEntryPointTest {
1414

1515
@Test
16-
fun isConfigurationValid_withEverythingOff_returnsTrue() {
17-
val (isValid, _) =
16+
fun isConfigurationValid_withEverythingOff_returnsFalse() {
17+
val (isValid, errorMessage) =
1818
DefaultNewArchitectureEntryPoint.isConfigurationValid(
1919
turboModulesEnabled = false,
2020
fabricEnabled = false,
2121
bridgelessEnabled = false,
2222
)
23-
assertThat(isValid).isTrue()
23+
assertThat(isValid).isFalse()
24+
assertThat(errorMessage)
25+
.isEqualTo(
26+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=false, bridgelessEnabled=false)"
27+
)
2428
}
2529

2630
@Test
27-
fun isConfigurationValid_withNewArchOn_returnsTrue() {
28-
val (isValid, _) =
31+
fun isConfigurationValid_withNewArchOnlyOn_returnsFalse() {
32+
val (isValid, errorMessage) =
2933
DefaultNewArchitectureEntryPoint.isConfigurationValid(
3034
turboModulesEnabled = true,
3135
fabricEnabled = true,
3236
bridgelessEnabled = false,
3337
)
34-
assertThat(isValid).isTrue()
38+
assertThat(isValid).isFalse()
39+
assertThat(errorMessage)
40+
.isEqualTo(
41+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=true, bridgelessEnabled=false)"
42+
)
3543
}
3644

3745
@Test
38-
fun isConfigurationValid_withTurboModulesOnlyOn_returnsTrue() {
39-
val (isValid, _) =
46+
fun isConfigurationValid_withTurboModulesOnlyOn_returnsFalse() {
47+
val (isValid, errorMessage) =
4048
DefaultNewArchitectureEntryPoint.isConfigurationValid(
4149
turboModulesEnabled = true,
4250
fabricEnabled = false,
4351
bridgelessEnabled = false,
4452
)
45-
assertThat(isValid).isTrue()
53+
assertThat(isValid).isFalse()
54+
assertThat(errorMessage)
55+
.isEqualTo(
56+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=false, bridgelessEnabled=false)"
57+
)
4658
}
4759

4860
@Test
@@ -67,7 +79,7 @@ class DefaultNewArchitectureEntryPointTest {
6779
assertThat(isValid).isFalse()
6880
assertThat(errorMessage)
6981
.isEqualTo(
70-
"fabricEnabled=true requires turboModulesEnabled=true (is now false) - Please update your DefaultNewArchitectureEntryPoint.load() parameters."
82+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=true, bridgelessEnabled=false)"
7183
)
7284
}
7385

@@ -82,7 +94,7 @@ class DefaultNewArchitectureEntryPointTest {
8294
assertThat(isValid).isFalse()
8395
assertThat(errorMessage)
8496
.isEqualTo(
85-
"fabricEnabled=true requires turboModulesEnabled=true (is now false) - Please update your DefaultNewArchitectureEntryPoint.load() parameters."
97+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=true, bridgelessEnabled=true)"
8698
)
8799
}
88100

@@ -97,7 +109,7 @@ class DefaultNewArchitectureEntryPointTest {
97109
assertThat(isValid).isFalse()
98110
assertThat(errorMessage)
99111
.isEqualTo(
100-
"bridgelessEnabled=true requires (turboModulesEnabled=true AND fabricEnabled=true) - Please update your DefaultNewArchitectureEntryPoint.load() parameters."
112+
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=false, bridgelessEnabled=true)"
101113
)
102114
}
103115
}

0 commit comments

Comments
 (0)