Skip to content

fix(apple): enable bridgeless by default with New Arch in 0.74 #1908

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

Merged
tido64 merged 1 commit into from
Mar 15, 2024
Merged

fix(apple): enable bridgeless by default with New Arch in 0.74 #1908

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
1 change: 0 additions & 1 deletion example/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ require "#{ws_dir}/node_modules/react-native-test-app/test_app.rb"
workspace 'Example.xcworkspace'

options = {
:bridgeless_enabled => false,
:fabric_enabled => false,
:hermes_enabled => false,
}
Expand Down
1 change: 0 additions & 1 deletion example/visionos/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ workspace 'Example.xcworkspace'

options = {
:fabric_enabled => false,
:bridgless_enabled => false,
:hermes_enabled => false,
}

Expand Down
8 changes: 4 additions & 4 deletions ios/pod_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ def assert_version(pod_version)
end

def bridgeless_enabled?(options, react_native_version)
return false unless new_architecture_enabled?(options, react_native_version)

supports_bridgeless = react_native_version.zero? || react_native_version >= v(0, 73, 0)
supports_bridgeless && options[:bridgeless_enabled]
new_architecture_enabled?(options, react_native_version) && (
(react_native_version >= v(0, 74, 0) && options[:bridgeless_enabled] != false) ||
(react_native_version >= v(0, 73, 0) && options[:bridgeless_enabled])
)
end

def find_file(file_name, current_dir)
Expand Down
10 changes: 10 additions & 0 deletions test/test_pod_helpers.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ def test_bridgeless_enabled?
# Bridgeless mode is first publicly available in 0.73
available_version = v(0, 73, 0)

# Bridgeless mode is enabled by default starting with 0.74
default_version = v(0, 74, 0)

refute(bridgeless_enabled?({}, 0))
refute(bridgeless_enabled?({}, available_version))

Expand All @@ -31,11 +34,18 @@ def test_bridgeless_enabled?
refute(bridgeless_enabled?(options, v(0, 72, 999)))
assert(bridgeless_enabled?(options, available_version))

# Bridgeless mode is enabled by default starting with 0.74 unless opted-out of
assert(bridgeless_enabled?({ :fabric_enabled => true }, default_version))
refute(bridgeless_enabled?({ :bridgeless_enabled => false, :fabric_enabled => true },
default_version))

# `RCT_NEW_ARCH_ENABLED` does not enable bridgeless
ENV['RCT_NEW_ARCH_ENABLED'] = '1'

refute(bridgeless_enabled?({}, v(0, 72, 999)))
refute(bridgeless_enabled?({}, available_version))
assert(bridgeless_enabled?({}, default_version))
refute(bridgeless_enabled?({ :bridgeless_enabled => false }, default_version))
end

def test_new_architecture_enabled?
Expand Down