Skip to content

Remove bridgelessEnabled from DefaultNewArchitectureEntryPoint (#58415) #58415

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
christophpurrer wants to merge 1 commit into from
+16 −103
Closed

Remove bridgelessEnabled from DefaultNewArchitectureEntryPoint (#58415) #58415

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
3 changes: 0 additions & 3 deletions packages/react-native/ReactAndroid/api/ReactAndroid.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,18 +1768,15 @@ public final class com/facebook/react/defaults/DefaultComponentsRegistry {

public final class com/facebook/react/defaults/DefaultNewArchitectureEntryPoint {
public static final field INSTANCE Lcom/facebook/react/defaults/DefaultNewArchitectureEntryPoint;
public static final fun getBridgelessEnabled ()Z
public static final fun getConcurrentReactEnabled ()Z
public static final fun getFabricEnabled ()Z
public final fun getReleaseLevel ()Lcom/facebook/react/common/ReleaseLevel;
public static final fun getTurboModulesEnabled ()Z
public static final fun load ()V
public static final fun load (Z)V
public static final fun load (ZZ)V
public static final fun load (ZZZ)V
public static synthetic fun load$default (ZILjava/lang/Object;)V
public static synthetic fun load$default (ZZILjava/lang/Object;)V
public static synthetic fun load$default (ZZZILjava/lang/Object;)V
public final fun setReleaseLevel (Lcom/facebook/react/common/ReleaseLevel;)V
}

Expand Down
53 changes: 9 additions & 44 deletions ...eactAndroid/src/main/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,50 +40,34 @@ public object DefaultNewArchitectureEntryPoint {
*/
@JvmStatic
public fun load() {
load(turboModulesEnabled = true, fabricEnabled = true, bridgelessEnabled = true)
load(turboModulesEnabled = true, fabricEnabled = true)
}

@JvmStatic
@Deprecated(
message =
"Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." +
"Please use load() instead when loading the New Architecture.",
"Loading the entry point with different flags for Fabric and TurboModule is deprecated." +
" Please use load() instead when loading the New Architecture.",
replaceWith = ReplaceWith("load()"),
)
public fun load(
turboModulesEnabled: Boolean = true,
) {
load(turboModulesEnabled, fabricEnabled = true, bridgelessEnabled = true)
load(turboModulesEnabled, fabricEnabled = true)
}

@JvmStatic
@Deprecated(
message =
"Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." +
"Please use load() instead when loading the New Architecture.",
"Loading the entry point with different flags for Fabric and TurboModule is deprecated." +
" Please use load() instead when loading the New Architecture.",
replaceWith = ReplaceWith("load()"),
)
public fun load(
turboModulesEnabled: Boolean = true,
fabricEnabled: Boolean = true,
) {
load(turboModulesEnabled, fabricEnabled, bridgelessEnabled = true)
}

@JvmStatic
@Deprecated(
message =
"Loading the entry point with different flags for Fabric, TurboModule and Bridgeless is deprecated." +
"Please use load() instead when loading the New Architecture.",
replaceWith = ReplaceWith("load()"),
)
public fun load(
turboModulesEnabled: Boolean = true,
fabricEnabled: Boolean = true,
bridgelessEnabled: Boolean = true,
) {
val (isValid, errorMessage) =
isConfigurationValid(turboModulesEnabled, fabricEnabled, bridgelessEnabled)
val (isValid, errorMessage) = isConfigurationValid(turboModulesEnabled, fabricEnabled)
if (!isValid) {
error(errorMessage)
}
Expand All @@ -103,7 +87,6 @@ public object DefaultNewArchitectureEntryPoint {
}

privateTurboModulesEnabled = turboModulesEnabled
privateBridgelessEnabled = bridgelessEnabled

DefaultSoLoader.maybeLoadSoLibrary()
}
Expand All @@ -113,17 +96,6 @@ public object DefaultNewArchitectureEntryPoint {
ReactNativeFeatureFlags.override(featureFlags)

privateTurboModulesEnabled = true
privateBridgelessEnabled = featureFlags.enableBridgelessArchitecture()

val (isValid, errorMessage) =
isConfigurationValid(
privateTurboModulesEnabled,
true,
privateBridgelessEnabled,
)
if (!isValid) {
error(errorMessage)
}

DefaultSoLoader.maybeLoadSoLibrary()
}
Expand All @@ -142,24 +114,17 @@ public object DefaultNewArchitectureEntryPoint {
public val concurrentReactEnabled: Boolean
get() = true

private var privateBridgelessEnabled: Boolean = false

@JvmStatic
public val bridgelessEnabled: Boolean
get() = privateBridgelessEnabled

@VisibleForTesting
public fun isConfigurationValid(
turboModulesEnabled: Boolean,
fabricEnabled: Boolean,
bridgelessEnabled: Boolean,
): Pair<Boolean, String> =
if (!turboModulesEnabled || !fabricEnabled || !bridgelessEnabled) {
if (!turboModulesEnabled || !fabricEnabled) {
false to
"You cannot load React Native with the New Architecture disabled. " +
"Please use DefaultNewArchitectureEntryPoint.load() instead of " +
"DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=$turboModulesEnabled, " +
"fabricEnabled=$fabricEnabled, bridgelessEnabled=$bridgelessEnabled)"
"fabricEnabled=$fabricEnabled)"
} else {
true to ""
}
Expand Down
63 changes: 7 additions & 56 deletions ...Android/src/test/java/com/facebook/react/defaults/DefaultNewArchitectureEntryPointTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,11 @@ class DefaultNewArchitectureEntryPointTest {
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = false,
fabricEnabled = false,
bridgelessEnabled = false,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=false, bridgelessEnabled=false)",
)
}

@Test
fun isConfigurationValid_withNewArchOnlyOn_returnsFalse() {
val (isValid, errorMessage) =
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = true,
fabricEnabled = true,
bridgelessEnabled = false,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=true, bridgelessEnabled=false)",
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=false)",
)
}

Expand All @@ -48,24 +32,12 @@ class DefaultNewArchitectureEntryPointTest {
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = true,
fabricEnabled = false,
bridgelessEnabled = false,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=false, bridgelessEnabled=false)",
)
}

@Test
fun isConfigurationValid_withBridgelessOn_returnsTrue() {
val (isValid, _) =
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = true,
fabricEnabled = true,
bridgelessEnabled = true,
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=false)",
)
assertThat(isValid).isTrue()
}

@Test
Expand All @@ -74,42 +46,21 @@ class DefaultNewArchitectureEntryPointTest {
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = false,
fabricEnabled = true,
bridgelessEnabled = false,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=true, bridgelessEnabled=false)",
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=true)",
)
}

@Test
fun isConfigurationValid_withBridgelessWithoutTurboModules_returnsFalse() {
val (isValid, errorMessage) =
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = false,
fabricEnabled = true,
bridgelessEnabled = true,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=false, fabricEnabled=true, bridgelessEnabled=true)",
)
}

@Test
fun isConfigurationValid_withBridgelessWithoutFabric_returnsFalse() {
val (isValid, errorMessage) =
fun isConfigurationValid_withEverythingOn_returnsTrue() {
val (isValid, _) =
DefaultNewArchitectureEntryPoint.isConfigurationValid(
turboModulesEnabled = true,
fabricEnabled = false,
bridgelessEnabled = true,
)
assertThat(isValid).isFalse()
assertThat(errorMessage)
.isEqualTo(
"You cannot load React Native with the New Architecture disabled. Please use DefaultNewArchitectureEntryPoint.load() instead of DefaultNewArchitectureEntryPoint.load(turboModulesEnabled=true, fabricEnabled=false, bridgelessEnabled=true)",
fabricEnabled = true,
)
assertThat(isValid).isTrue()
}
}
Loading