Skip to content

Update .xcode.env.local on pod install when its node no longer exists #59539

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

Open
lazerg wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update .xcode.env.local on pod install when its node no longer exists #59539

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
41e6536
Recreate .xcode.env.local on pod install when its node no longer exists
lazerg Oct 27, 2026
bcc9d32
Keep the rest of .xcode.env.local when replacing a removed node
lazerg Oct 27, 2026
c951f79
Treat an empty NODE_BINARY in .xcode.env.local as broken
lazerg Oct 28, 2026
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
10 changes: 10 additions & 0 deletions packages/react-native/scripts/cocoapods/__tests__/test_utils/FileMock.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class FileMock < File
@@open_files = []

@@files_to_read = {}
@@written_files = {}
attr_reader :collected_write
attr_reader :fsync_invocation_count

Expand Down Expand Up @@ -98,6 +99,14 @@ def self.read(filepath)
return @@files_to_read[filepath]
end

def self.write(filepath, content)
@@written_files[filepath] = content
end

def self.written_files
return @@written_files
end

# Resets all the settings for the File mock
def self.reset()
@@delete_invocation_count = 0
Expand All @@ -109,5 +118,6 @@ def self.reset()
@@file_invocation_params = []
@@exist_invocation_params = []
@@files_to_read = {}
@@written_files = {}
end
end
34 changes: 32 additions & 2 deletions packages/react-native/scripts/cocoapods/__tests__/utils-test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,13 +747,43 @@ def test_setBuildSettingDebug_addTheUserSetting
# =================================== #
def test_createXcodeEnvIfMissing_whenTheyArePresent_doNothing
# Arrange
FileMock.mocked_existing_files("/.xcode.env")
FileMock.mocked_existing_files("/.xcode.env.local")
FileMock.mocked_existing_files(["/.xcode.env", "/.xcode.env.local", "/usr/local/bin/node"])
FileMock.files_to_read({
"/.xcode.env.local" => "export NODE_BINARY=/usr/local/bin/node\n",
})
# Act
ReactNativePodsUtils.create_xcode_env_if_missing(file_manager: FileMock)
# Assert
assert_equal(["/.xcode.env", "/.xcode.env.local", "/usr/local/bin/node"], FileMock.exist_invocation_params)
assert_equal([], $collected_commands)
end

def test_createXcodeEnvIfMissing_whenLocalNodeIsMissing_updatesNodeBinary
# Arrange
FileMock.mocked_existing_files(["/.xcode.env", "/.xcode.env.local"])
FileMock.files_to_read({
"/.xcode.env.local" => "export FOO=bar\nexport NODE_BINARY=/old/bin/node\n",
})
# Act
ReactNativePodsUtils.create_xcode_env_if_missing(file_manager: FileMock)
# Assert
assert_equal(["/.xcode.env", "/.xcode.env.local", "/old/bin/node"], FileMock.exist_invocation_params)
assert_equal([], $collected_commands)
assert_match(/\Aexport FOO=bar\nexport NODE_BINARY=(?!\/old\/bin\/node).+\n\z/, FileMock.written_files["/.xcode.env.local"])
end

def test_createXcodeEnvIfMissing_whenLocalNodeIsEmpty_updatesNodeBinary
# Arrange
FileMock.mocked_existing_files(["/.xcode.env", "/.xcode.env.local"])
FileMock.files_to_read({
"/.xcode.env.local" => "export FOO=bar\nexport NODE_BINARY=\n",
})
# Act
ReactNativePodsUtils.create_xcode_env_if_missing(file_manager: FileMock)
# Assert
assert_equal(["/.xcode.env", "/.xcode.env.local"], FileMock.exist_invocation_params)
assert_equal([], $collected_commands)
assert_match(/\Aexport FOO=bar\nexport NODE_BINARY=.+\n\z/, FileMock.written_files["/.xcode.env.local"])
end

def test_createXcodeEnvIfMissing_whenTheyAreNotPresent_createsThem
Expand Down
19 changes: 17 additions & 2 deletions packages/react-native/scripts/cocoapods/utils.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,16 +306,31 @@ def self.create_xcode_env_if_missing(file_manager: File)
system("echo 'export NODE_BINARY=$(command -v node)' > #{file_path}")
end

if !file_manager.exist?("#{file_path}.local")
local_file_exists = file_manager.exist?("#{file_path}.local")
if !local_file_exists || !self.local_node_binary_exists?("#{file_path}.local", file_manager: file_manager)
# When installing pods with a yarn alias, yarn creates a fake yarn and node executables
# in a temporary folder.
# Using `node --print "process.argv[0]";` we are able to retrieve the actual path from which node is running.
# see https://github.com/facebook/react-native/issues/43285 for more info. We've tweaked this slightly.
node_binary = Shellwords.escape(`node --print "process.argv[0]"`.strip)
system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
if local_file_exists
local_env = file_manager.read("#{file_path}.local")
file_manager.write("#{file_path}.local", local_env.gsub(/^export NODE_BINARY=.*$/) { "export NODE_BINARY=#{node_binary}" })
else
system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
end

@cipolleschi cipolleschi Oct 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Empty/malformed NODE_BINARY value treated as valid, leaving broken file unrepaired
local_node_binary_exists? returns true when the captured NODE_BINARY is nil, but an empty line export NODE_BINARY= fails the (.+) capture and produces nil — so a file with an empty/unset NODE_BINARY is considered valid and left untouched. This is exactly the broken-build state the diff is meant to repair, so the build continues to fail.

@lazerg lazerg Oct 28, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, fixed in c951f79. An empty value, including "", now counts as broken and gets replaced on pod install. I added a test for it.

end
end

def self.local_node_binary_exists?(local_file_path, file_manager: File)
node_binary = file_manager.read(local_file_path).scan(/^export NODE_BINARY=(.*)$/).flatten.last
return true if node_binary.nil?
node_binary = Shellwords.split(node_binary).first
return false if node_binary.nil? || node_binary.empty?
return true if !node_binary.start_with?("/")
return file_manager.exist?(node_binary)
end

# It examines the target_definition property and sets the appropriate value for
# ENV['USE_FRAMEWORKS'] variable.
#
Expand Down
Loading